- small fix to avoid NPE