Fixing error handling for issue #326