A little work on the exceptions for the UI
Merge branch 'master' of github.com:openskye/openskye