Range is a good idea, going to experiment with that.
I think (hope) that bug should be resolved for all abilities that move units. They all derive from the same class so they should handle not being able to move the targets for any ability.