extra try catch + formatting.
Merge branch 'feature/robb/trycatch' into develop