Bugfix: Minor changes to error handling code