Add check to prevent notice