diff --git a/modules/org.restlet/src/org/restlet/resource/ServerResource.java b/modules/org.restlet/src/org/restlet/resource/ServerResource.java
index 0624ebfb62..3fe6060de0 100644
--- a/modules/org.restlet/src/org/restlet/resource/ServerResource.java
+++ b/modules/org.restlet/src/org/restlet/resource/ServerResource.java
@@ -1018,7 +1018,7 @@ public Representation handle() {
                     result = doHandle();
                 }
 
-                if (!getResponse().isEntityAvailable()) {
+                if (result != null && !getResponse().isEntityAvailable()) {
                     // If the user manually set the entity, keep it
                     getResponse().setEntity(result);
                 }