Merge "Fixes a crash when logging"