Change configuration schema
Fix capture logic and tests
Clarify which errors are captured