Add additional InternalLogging logs
Fix InternalLogging error in exception handler