Better error handling
Merge branch 'develop' of https://github.com/ioannis-e/AMR into develop