fixed nasty NPE