DDF-111: Move exception to a more appropriate location