diff --git a/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java
index f32c6b114adc6db129d1f18ac4bc9ff2fb9f891e..e4e4634c76d8599ba19122c4a7de983338983aa2 100644
--- a/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java
+++ b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java
@@ -841,9 +841,12 @@ public abstract class DBBrokerTemplate implements DBBroker {
                 columnMetadata.put(Column.ORIGINAL_DATATYPE_KEY, originalDataType);
 
                 // Override data type using model definition
-                String adqlType = tableModel.get(columnName).getType();
-                String definedDataType = TypesMapping.getDataType(adqlType, dataTypeMode);
-                columnMetadata.put(Column.DATATYPE_KEY, definedDataType);
+                ColumnModel columnModel = tableModel.get(columnName);
+                if (columnModel != null) {
+                    String adqlType = columnModel.getType();
+                    String definedDataType = TypesMapping.getDataType(adqlType, dataTypeMode);
+                    columnMetadata.put(Column.DATATYPE_KEY, definedDataType);
+                }
             }
         }
 
diff --git a/TASMAN-webapp/src/main/webapp/consistencyChecks.xhtml b/TASMAN-webapp/src/main/webapp/consistencyChecks.xhtml
index 9b7ee7d4247913c6695f5c93b273b80b36007c4f..7d3403da551907990edd020af467c023dbc481d4 100644
--- a/TASMAN-webapp/src/main/webapp/consistencyChecks.xhtml
+++ b/TASMAN-webapp/src/main/webapp/consistencyChecks.xhtml
@@ -55,19 +55,19 @@
                             </ul>
                         </h:panelGroup>
 
-                        <h:panelGroup rendered="#{consistency.tapSchema.consistencyChecks.unexisingTables.size() gt 0}">
+                        <h:panelGroup rendered="#{consistency.tapSchema.consistencyChecks.unexistingTables.size() gt 0}">
                             <h2>Inexistent tables</h2>
                             <ul>
-                                <ui:repeat value="#{consistency.tapSchema.consistencyChecks.unexisingTables}" var="table">
+                                <ui:repeat value="#{consistency.tapSchema.consistencyChecks.unexistingTables}" var="table">
                                     <li>${table}</li>
                                 </ui:repeat>
                             </ul>
                         </h:panelGroup>
 
-                        <h:panelGroup rendered="#{consistency.tapSchema.consistencyChecks.unexisingColumns.size() gt 0}">
+                        <h:panelGroup rendered="#{consistency.tapSchema.consistencyChecks.unexistingColumns.size() gt 0}">
                             <h2>Inexistent columns</h2>
                             <ul>
-                                <ui:repeat value="#{consistency.tapSchema.consistencyChecks.unexisingColumns.toArray()}" var="column">
+                                <ui:repeat value="#{consistency.tapSchema.consistencyChecks.unexistingColumns.toArray()}" var="column">
                                     <li>${column}</li>
                                 </ui:repeat>
                             </ul>