#130 avoid NPE