Improve error logging and handling