Bugfix for mentor null