Added a fix for NPE caused by empty response (for example network related)