handle exception case
Merge branch 'vault' of github.com:maidsafe/MaidSafe-Vault into vault