diff --git a/src/tink/macro/Metadatas.hx b/src/tink/macro/Metadatas.hx
index a95fa96..5cc44b3 100644
--- a/src/tink/macro/Metadatas.hx
+++ b/src/tink/macro/Metadatas.hx
@@ -5,16 +5,17 @@ import haxe.macro.Expr;
 class Metadatas {	
 	static public function toMap(m:Metadata) {
 		var ret = new Map<String,Array<Array<Expr>>>();
-		for (meta in m) {
-			if (!ret.exists(meta.name))
-				ret.set(meta.name, []);
-			ret.get(meta.name).push(meta.params);
-		}
+		if (m != null)
+			for (meta in m) {
+				if (!ret.exists(meta.name))
+					ret.set(meta.name, []);
+				ret.get(meta.name).push(meta.params);
+			}
 		return ret;
 	}
 	
 	static public function getValues(m:Metadata, name:String)
-		return [for (meta in m) 
-			if (meta.name == name) meta.params
-		];	
+		return 
+			if (m == null) [];
+			else [for (meta in m) if (meta.name == name) meta.params];	
 }
\ No newline at end of file