Improve error handling.
Comment debug message.