Fixes issue #30. No more NPE.