Tweaked error handling more.