Merge "Improved error handling"