IMPORTANT: Fixed NPE in reinjection