Add raise exception
Merge branch 'server' of git@github.com:nlurkin/batchMon.git into server