Avoid catch (NullPointerException e), take II