Use exceptions in some display methods
Merge branch 'source' into develop