make sure that ComponentManager.CurrentDockItem!=null

Change-Id: I223315c96772c44b3a3cfeaa2d4ae863c3e4dba9