Fix/npe dependency injector

Fix for #10