NPE. Fixes #178