2nd Commit with Exceptions added