* Added if null check to prevent NPE spam.