Fixing NPEs that occur from unsufficient server responses