I got around the problem by including a bypass in my error trapping on the feature not available error. That way if I forget to take out a set step on it doesn't matter any more.