Refs #9473 Improve error handling
Merge branch 'feature/9473_refl_add_options_column' into develop