Add else blocks are handler could be null