Replace else and just return