Fix to avoid IllegalStateException in case of GCM delay