Fixed NPE on Service update