Added a bunch of error handlers, need a robust way to handle if a message is permanently deleted
Everything is caught
Fixed merge conflicts