Bugfix in error handling code...