Merge "Improve error handling"