Simpify control flow context

[vreuter]

• factors out common exception handling context, saving some code and more clearly showing what's affected by the branches of the conditional expression
• adds return code for success case of validation