Improve error handling in general