Fix to handle null/undefined data

This is a temp patch, we need to refactor this later, just making sure we don't error out of response is null/undefined.

- Adding check and handlers for null/undefined data responses

cc @jmctradeshift