#529 avoid null exception