diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp
index bc3db4f6..1e54a712 100644
--- a/src/libcamera/controls.cpp
+++ b/src/libcamera/controls.cpp
@@ -701,9 +701,32 @@ bool ControlInfoMap::validate()
  				      ? ControlTypeInteger32 : id->type();
  		const ControlInfo &info = ctrl.second;

+		if (!(info.min().isArray() == info.max().isArray() &&
+		      info.min().numElements() == info.max().numElements())) {
+			LOG(Controls, Error)
+				<< "Control " << id->name()
+				<< " range must have the same dimension.";
+			return false;
+		}
+
+		if (info.min().type() != info.max().type()) {
+			LOG(Controls, Error)
+				<< "Control " << id->name()
+				<< " range types mismatch";
+			return false;
+		}
+
+		if (info.def().type() != ControlTypeNone &&
+			info.min().type() != info.def().type()) {
+			LOG(Controls, Error)
+				<< "Control " << id->name()
+				<< " default value and info type mismatch";
+			return false;
+		}
+
  		if (info.min().type() != rangeType) {
  			LOG(Controls, Error)
-				<< "Control " << utils::hex(id->id())
+				<< "Control " << id->name()
  				<< " type and info type mismatch";
  			return false;
  		}