diff --git a/src/Handlebars/Arguments.php b/src/Handlebars/Arguments.php
index 9cbe1c1..7a90ae6 100644
--- a/src/Handlebars/Arguments.php
+++ b/src/Handlebars/Arguments.php
@@ -56,9 +56,9 @@ class Arguments
      */
     public function __construct($args_string = false)
     {
-        $this->originalString = $args_string;
+        $this->originalString = (string)$args_string;
 
-        if ($args_string) {
+        if ($this->originalString !== '') {
             $this->parse($args_string);
         }
     }
diff --git a/tests/Xamin/HandlebarsTest.php b/tests/Xamin/HandlebarsTest.php
index d3c66cc..64b80e2 100644
--- a/tests/Xamin/HandlebarsTest.php
+++ b/tests/Xamin/HandlebarsTest.php
@@ -801,6 +801,7 @@ class HandlebarsTest extends \PHPUnit_Framework_TestCase
             array('arg1 "arg\"2" "\\\'arg3\\\'"', array("arg1", 'arg"2', "'arg3'")),
             array('arg1 arg2.[value\'s "segment"].val', array("arg1", 'arg2.[value\'s "segment"].val')),
             array('"arg1.[value 1]" arg2', array("arg1.[value 1]", 'arg2')),
+            array('0', array('0')),
         );
     }