+ fix a possible NullPointerException