Merge "Fix NullPointerException thrown by logging"