tweaked error handling logs