Empty body support
* TODO: Move into the status code check