Bugfix: show error message in all cases