diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/AbstractDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/AbstractDesktop.java
index a0aded7a01..388617740e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/AbstractDesktop.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/AbstractDesktop.java
@@ -358,6 +358,8 @@ public abstract class AbstractDesktop extends AbstractUIPart implements IDesktop
    	 * @return List of registered windows
    	 */
     protected List<Object> getWindows(){
+    	if(getComponent() == null)
+    		return null;
     	Desktop desktop = getComponent().getDesktop();
     	if (desktop != null) {
 	    	Session session = desktop.getSession();