Merge "Catch BadRequest exception from correct module"