Update to add proper formatted exception
Merge branch 'release/0.5.0' into develop