Add error handling

[markedavisq]

Use memory analysis tools to check for memory leak issues, especially in long-running applications.

---

This issue was automatically generated by script