better error checking
Merge branch 'master' of git@github.com:webmin/webmin