Revert "Should throw an error 404 if body is null" - and this one

This reverts commit 3cd5f370971583d28f92e7064f6ecd4986334a78.