+ replace catch for NPE with if clause