diff --git a/Source/Core/Types/FloatHandler.cs b/Source/Core/Types/FloatHandler.cs
index 45f050344e85544f3232d6176fe49b7e606e02b6..ded0f68424b8e0fe1b59dd246323f40ec33923b6 100755
--- a/Source/Core/Types/FloatHandler.cs
+++ b/Source/Core/Types/FloatHandler.cs
@@ -52,7 +52,7 @@ namespace CodeImp.DoomBuilder.Types
 
 		public override void SetupField(TypeHandlerAttribute attr, UniversalFieldInfo fieldinfo)
 		{
-			defaultvalue = fieldinfo == null ? 0.0 : (double)fieldinfo.Default;
+			defaultvalue = (fieldinfo == null || fieldinfo.Default == null) ? 0.0 : (double)fieldinfo.Default;
 			base.SetupField(attr, fieldinfo);
 		}
 
diff --git a/Source/Core/Types/IntegerHandler.cs b/Source/Core/Types/IntegerHandler.cs
index fe01c87abc5c8f744f9e99d1f1abfe9284e879b3..780cf78ecaba41a37a160504daea343dd0f1e03d 100755
--- a/Source/Core/Types/IntegerHandler.cs
+++ b/Source/Core/Types/IntegerHandler.cs
@@ -53,7 +53,7 @@ namespace CodeImp.DoomBuilder.Types
 
 		public override void SetupField(TypeHandlerAttribute attr, UniversalFieldInfo fieldinfo)
 		{
-			defaultvalue = fieldinfo == null ? 0 : (int)fieldinfo.Default;
+			defaultvalue = (fieldinfo == null || fieldinfo.Default == null) ? 0 : (int)fieldinfo.Default;
 			base.SetupField(attr, fieldinfo);
 		}