Improve error messages on else do grammar mistakes, closes #888