Added error handling for ISO codes addresses issue #1 partially