Fcrepo 70584818

Fixes to address Sonar CRITICAL warnings:

Switch cases should end with an unconditional break statement
Exception handlers should provide some context and preserve the original exception