Better guards for error handling
Merge branch 'develop' of github.com:UPCnet/maxbunny into develop