[JBIDE-15200] fixed NPE & made sure we inform the user about  timeout