Added if-non-null/checked if.