diff --git a/org.adempiere.base/src/org/compiere/print/DataEngine.java b/org.adempiere.base/src/org/compiere/print/DataEngine.java
index a81892f9d8..0489bf31d8 100644
--- a/org.adempiere.base/src/org/compiere/print/DataEngine.java
+++ b/org.adempiere.base/src/org/compiere/print/DataEngine.java
@@ -370,6 +370,9 @@ public class DataEngine
 						eSql = MLookupFactory.getLookup_TableDirEmbed(m_language, ColumnName, tableName);
 					}
 
+					if (Util.isEmpty(eSql)) { // No Identifier records found
+						eSql = lookupSQL;
+					}
 					//  DisplayColumn
 					String display = ColumnName;
 					//	=> (..) AS AName, Table.ID,
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
index 891b4e1fab..bf8b4d0b13 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
@@ -189,9 +189,12 @@ public class ReportAction implements EventListener<Event>
 		else if(event.getTarget() == chkExport)
 			cboExportType.setVisible(chkExport.isChecked());
 		else if (event.getName().equals("onValidate")) {
-			validate();
-			Clients.clearBusy();
-			panel.getComponent().invalidate();
+			try {
+				validate();
+			} finally {
+				Clients.clearBusy();
+				panel.getComponent().invalidate();
+			}
 		}
 	}