Added additional check to suppress notices