Improved error handling once more