add else checks in intent service