#124 avoid NPE