Better exceptions
Merge branch 'develop' of github.com:galaxy-team/saturn into develop