Rolling back edits to remove exception stuff