Make sure a mount is found before doing things with him.

If there isn't a mount, just remove the dragon.