More except handeling.
Merge branch 'master' of http://github.com/kalhauge/distribuerede-systemer-code