diff --git a/src/com/massivecraft/massivecore/command/type/primitive/TypeDouble.java b/src/com/massivecraft/massivecore/command/type/primitive/TypeDouble.java
index 186d1970..fdd8cc6f 100644
--- a/src/com/massivecraft/massivecore/command/type/primitive/TypeDouble.java
+++ b/src/com/massivecraft/massivecore/command/type/primitive/TypeDouble.java
@@ -25,7 +25,9 @@ public class TypeDouble extends TypeAbstractNumber<Double>
 	@Override
 	public Double valueOf(String arg, CommandSender sender) throws Exception
 	{
-		return Double.parseDouble(arg);
+		var ret = Double.parseDouble(arg);
+		if (!Double.isFinite(ret)) throw new Exception();
+		return ret;
 	}
 
 }
diff --git a/src/com/massivecraft/massivecore/command/type/primitive/TypeFloat.java b/src/com/massivecraft/massivecore/command/type/primitive/TypeFloat.java
index bbddd853..99829936 100644
--- a/src/com/massivecraft/massivecore/command/type/primitive/TypeFloat.java
+++ b/src/com/massivecraft/massivecore/command/type/primitive/TypeFloat.java
@@ -25,7 +25,9 @@ public class TypeFloat extends TypeAbstractNumber<Float>
 	@Override
 	public Float valueOf(String arg, CommandSender sender) throws Exception
 	{
-		return Float.parseFloat(arg);
+		var ret = Float.parseFloat(arg);
+		if (!Float.isFinite(ret)) throw new Exception();
+		return ret;
 	}
 
 }