Fixed <null> text when target is null