Changed service_mapper_notify() origin==NULL behaviour