Remove ErrorResponse's from filters
Merge branch 'production'