added the originating machine to command exceptions