modify error handling
Merge branch 'next' of github.com:maidsafe/MaidSafe-Vault into next