Author: scabanovich Date: 2009-06-08 10:48:14 -0400 (Mon, 08 Jun 2009) New Revision: 15776 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/impl/TilesModel.java Log: https://jira.jboss.org/jira/browse/JBIDE-4433 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/impl/TilesModel.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/impl/TilesModel.java 2009-06-08 14:47:52 UTC (rev 15775) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/impl/TilesModel.java 2009-06-08 14:48:14 UTC (rev 15776) @@ -199,8 +199,10 @@ public void disconnectFromModel() { if (listener != null) source.getModel().removeModelTreeListener(listener); - options.disconnectFromModel(); - map.disconnectFromModel(); + if (options != null) + options.disconnectFromModel(); + if (map != null) + map.disconnectFromModel(); } public boolean isEditable() {