[bugfix]  Avoid NPE