This PR improves the error messages produced by `end` and prevents
invalid `end` commands from closing scopes on failure.
---------
Co-authored-by: Rob23oba <152706811+Rob23oba@users.noreply.github.com>
Co-authored-by: Joachim Breitner <mail@joachim-breitner.de>
