Added some error handling
Merge branch 'master' of github.com:Tvede-dk/ml-3