Merge "Move exceptions back into one place"