BF: Make error handling more robust
Merge branch 'neurosbh-paraval' into cmdline_modular

* neurosbh-paraval:
  BF: Make error handling more robust