Changing how (!) is added to the name and fixing null pointer exception