Fix for mysterious NPE

closes #27