added exception handling
Merge branch 'master' of github.com:axelmartensson/xl