More error handling / log beautification