WIP: Better error handling (Partial Commit)