v1.1.0.351 - really fix the NPE mentioned in #351