Minor - Add check to avoid Notice logs