fixes #2376 hot fix for simple NPE issue