diff --git a/lib/helpers.nix b/lib/helpers.nix
index 724558ca..f2b8ccc2 100644
--- a/lib/helpers.nix
+++ b/lib/helpers.nix
@@ -272,9 +272,9 @@ with lib; rec {
   };
 
   mkRaw = r:
-    ifNonNull'
-    r
-    {__raw = r;};
+    if (isString r && (r != ""))
+    then {__raw = r;}
+    else null;
 
   wrapDo = string: ''
     do