Added some checks to SelfName