diff --git a/dyaml/resolver.d b/dyaml/resolver.d
index d83807a..17da8f2 100644
--- a/dyaml/resolver.d
+++ b/dyaml/resolver.d
@@ -242,9 +242,8 @@ final class Resolver
                                        "|[-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+)$"),
                                 "-+0123456789");
             addImplicitResolver("tag:yaml.org,2002:merge", regex(r"^<<$"), "<");
-
             addImplicitResolver("tag:yaml.org,2002:null", 
-                                regex(r"^(?:~|null|Null|NULL|\0)?$"), "~nN\0");
+                                regex(r"^$|^(?:~|null|Null|NULL)$"), "~nN\0");
             addImplicitResolver("tag:yaml.org,2002:timestamp", 
                                 regex(r"^[0-9][0-9][0-9][0-9]-[0-9][0-9]-"
                                        "[0-9][0-9]|[0-9][0-9][0-9][0-9]-[0-9]"
diff --git a/dyaml/zerostring.d b/dyaml/zerostring.d
index c3716cf..cee2cba 100644
--- a/dyaml/zerostring.d
+++ b/dyaml/zerostring.d
@@ -55,9 +55,8 @@ struct ZeroString(string TypeName)
         in{assert(!isNull);}
         body
         {
-            static type = typeid(string);
             auto str = get();
-            return type.getHash(&str);
+            return typeid(string).getHash(&str);
         }
 
         ///Compare with another string.