BUG FIX

Resolving nullPointer when server returns null.