2nd commit: Addign exceptions