Exception cleanup (Still getting used to git - actual file modifications for last commit.)