Enhancement: Better Error Handling

Currently, the logic is pretty patchy - no error handling code.

We need to handle errors at different stages of the funnel and bubble the error upwards until it's written to the client (currently it's masked by error 500).