Rather than suppress with '@', call isset() first

Change-Id: Ia2713c3fded927ea67c086afe63330c7f0ad0cbf