More error logging + username is included