Fixed NPE when optional data is not fully retrieved