Small tweaks to error handling