Log error and bail out if unable to substitute filter
Fix mapping for client and authorization code domain classes