Only set originator if it was passed. Previous code resulted in command
response events being created even when originator was not passed.