Fix the NPE issue before software managers implement getName()

Please enter the commit message for your changes. Lines starting