Bugfix: error messages and tags