Softer failure

Getting NullPointerException for some reason :trollface: