diff --git a/src/com/activeandroid/ModelInfo.java b/src/com/activeandroid/ModelInfo.java
index 09e79117c..1d3c37e9c 100644
--- a/src/com/activeandroid/ModelInfo.java
+++ b/src/com/activeandroid/ModelInfo.java
@@ -79,6 +79,11 @@ public Collection<TableInfo> getTableInfos() {
 	}
 
 	public TableInfo getTableInfo(Class<? extends Model> type) {
+
+		if(!mTableInfos.containsKey(type)){
+			mTableInfos.put(type, new TableInfo(type));
+		}
+
 		return mTableInfos.get(type);
 	}