avoid NullPinterException - resolves #88