Marginally improve error handling