Fixing NPEs that occur from unsufficient server responses
Merge pull request #77 from kesapojat/master

Fixing NPEs that occur from unsufficient server responses