Fixed NPE on response