diff --git a/src/uws/service/log/DefaultUWSLog.java b/src/uws/service/log/DefaultUWSLog.java
index dd03f8ff49bb236c88f8326f13b7e15ffc51befe..a4e0129a3bd4c4015eb0dec6c37427960934d4bb 100644
--- a/src/uws/service/log/DefaultUWSLog.java
+++ b/src/uws/service/log/DefaultUWSLog.java
@@ -463,7 +463,7 @@ public class DefaultUWSLog implements UWSLog {
 			str.append(')');
 
 			// Send the log message to the log file:
-			log(level, "HTTP", "REQUEST_RECEIVED", requestId, message, str.toString(), error);
+			log(level, "HTTP", "REQUEST_RECEIVED", requestId, (message != null ? message : str.toString()), (message != null ? str.toString() : null), error);
 		}
 		// OTHERWISE, just write the given message:
 		else