Cater for null responses
Merge pull request #71 from miguelgonz/safer_response

15490: Cater for null responses