Fixed #398 and fixed #399
Merge branch 'master' of github.com:CERN/apvs
Bug fix
Fixed #400
Fixing error message