Fix null detecting, is_widget just in case..