Update to reflect silly new exceptions thrown