Do not attempt to unregister continuous query if query ID is null
@@ -703,6 +703,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter {
catch (IgniteCheckedException e) {
log.warning("Failed to start continuous query.", e);
+ if (id != null)
cctx.kernalContext().continuous().stopRoutine(id);
throw new IgniteCheckedException("Failed to start continuous query.", e);
