diff --git a/src/Fusonic/Linq/Linq.php b/src/Fusonic/Linq/Linq.php
index 9c0e359..31d1df7 100644
--- a/src/Fusonic/Linq/Linq.php
+++ b/src/Fusonic/Linq/Linq.php
@@ -195,7 +195,7 @@ public function aggregate(callable $func, $seed = null)
     public function chunk($chunksize)
     {
         if ($chunksize < 1) {
-            throw new \InvalidArgumentException("chunksize", $chunksize);
+            throw new \InvalidArgumentException("'{$chunksize}' is not a valid chunk size.");
         }
 
         return Linq::from(new ChunkIterator($this->iterator, $chunksize));
diff --git a/tests/Fusonic/Linq/Test/ChunkTest.php b/tests/Fusonic/Linq/Test/ChunkTest.php
index a59236e..3abbc05 100644
--- a/tests/Fusonic/Linq/Test/ChunkTest.php
+++ b/tests/Fusonic/Linq/Test/ChunkTest.php
@@ -67,6 +67,14 @@ public function testChunk_throwsException_IfchunksizeIsInvalid()
         $this->assertException(function () {
             Linq::from([])->chunk(-1);
         }, self::ExceptionName_InvalidArgument);
+
+        $this->assertException(function () {
+            Linq::from([])->chunk(null);
+        }, self::ExceptionName_InvalidArgument);
+
+        $this->assertException(function () {
+            Linq::from([])->chunk("");
+        }, self::ExceptionName_InvalidArgument);
     }
 
     public function testChunk_ReturnsChunkedElementsAccordingToChunksize()