Issue #51 Updating exception messages and adding formatting changes