rescued changes, added an exception and some additional tests.