diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/FavouriteController.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/FavouriteController.java
index 791087856b..c1ce273824 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/FavouriteController.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/FavouriteController.java
@@ -212,7 +212,8 @@ public class FavouriteController
 			if (treeModel != null)
 			{
 				DefaultTreeNode<Object> treeNode = treeModel.find(treeModel.getRoot(), favNode.getAD_Tree_Favorite_Node_ID());
-				treeModel.removeNode(treeNode);
+				if(treeNode != null)
+					treeModel.removeNode(treeNode);
 			}
 
 			nodeMap.remove(nodeId);