Fixed bug with `else` being null