fix the exception issues
Merge branch 'master' of https://github.com/digitalabs/Fieldbook