Defect Fix: Returning an empty object instead of null from server..