Updated version; changed exception to relevant type; updated unit test.