More exception handling
Merge branch 'feature/Reserves' into develop

* feature/Reserves:
  More exception handling