Improve error logging...