Fixing surefire NPE