diff --git a/src/ifcgeom/IfcGeomIterator.h b/src/ifcgeom/IfcGeomIterator.h
index ec153c715b..c48e934a5c 100644
--- a/src/ifcgeom/IfcGeomIterator.h
+++ b/src/ifcgeom/IfcGeomIterator.h
@@ -273,10 +273,15 @@ namespace IfcGeom {
 			}
 
             if (representations->size() == 0) {
-                Logger::Message(Logger::LOG_ERROR, "No geometries found");
-                return false;
+                Logger::Message(Logger::LOG_ERROR, "No representations encountered in relevant contexts, using all");
+				representations = ifc_file->entitiesByType<IfcSchema::IfcRepresentation>();
             }
 
+			if (representations->size() == 0) {
+				Logger::Message(Logger::LOG_ERROR, "No representations encountered, aborting");
+				return false;
+			}
+
 			representation_iterator = representations->begin();
 			ifcproducts.reset();