more exception catching
Merge branch 'master' of github.com:hepix-virtualisation/vmcatcher