Added some error checking for no data responses