diff --git a/eZ/Publish/API/REST/Server/View/Visitor.php b/eZ/Publish/API/REST/Server/View/Visitor.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/API/REST/Server/View/Visitor.php
+++ b/eZ/Publish/API/REST/Server/View/Visitor.php
@@ -44,7 +44,16 @@ class Visitor extends RMF\View
      */
     public function display( RMF\Request $request, $result )
     {
-        $message = $this->visitor->visit( $result );
+        if ( $result === null )
+        {
+            $message = new Common\Message(
+                array( 'Status' => '200 No content', )
+            );
+        }
+        else
+        {
+            $message = $this->visitor->visit( $result );
+        }
 
         foreach ( $message->headers as $name => $value )
         {
Implemented: Correct handling of empty bodies.

The visitor now automatically detects if the return value of a
controller is null and then sends the correct "<I> No Content" header.
This solves the issue of "No Content" for now, let's see if we need
additional header handling from the controller side.