initial work on #1144
squash npe