run a subst in a catch. if Error, just return the value passed in. That would probably be the easiest and non TIP requiring fix, but I am not sure if it is the best one.