added exceptions and checking for Unknonw names