Removed dead method which had confusing 'TODO' statement; added exception codes.