On error exit appropriately
Merge pull request #92 from Versal/feature/on-error-exit-appropriately

On error exit appropriately