Moved route exceptions into inner wrapper