#70 fixed intermittent null pointer exception