diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnDataType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnDataType.java
index 0c723d0..4aba143 100644
--- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnDataType.java
+++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnDataType.java
@@ -34,6 +34,8 @@ public enum ColumnDataType {
 	 * @return
 	 */
 	public static ColumnDataType getColumnDataTypeFromId(String id) {
+		if(id==null||id.isEmpty()) return null;
+		
 		for (ColumnDataType columnDataType : values()) {
 			if (columnDataType.id.compareToIgnoreCase(id) == 0) {
 				return columnDataType;
diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnTypeCode.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnTypeCode.java
index aac89fb..a79a43d 100644
--- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnTypeCode.java
+++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnTypeCode.java
@@ -56,6 +56,8 @@ public enum ColumnTypeCode {
 	 * @return
 	 */
 	public static ColumnTypeCode getColumnTypeCodeFromId(String id) {
+		if(id==null|| id.isEmpty()) return null;
+		
 		for (ColumnTypeCode columnTypeCode : values()) {
 			if (columnTypeCode.id.compareToIgnoreCase(id) == 0) {
 				return columnTypeCode;