diff --git a/examples/auth-vanilla-js/index.js b/examples/auth-vanilla-js/index.js
index d1ae89a03f4..67c2089761c 100644
--- a/examples/auth-vanilla-js/index.js
+++ b/examples/auth-vanilla-js/index.js
@@ -47,6 +47,7 @@ const logInSubmitted = (event) => {
     .then((response) => {
       document.querySelector('#access-token').value = response.data.access_token
       document.querySelector('#refresh-token').value = response.data.refresh_token
+      // response.error ?
       alert("Logged in as " + response.user.email)
     })
     .catch((err) => {
diff --git a/examples/live-tracker-map/pages/_app.js b/examples/live-tracker-map/pages/_app.js
index c4b4d54c0a1..5917ecafbab 100644
--- a/examples/live-tracker-map/pages/_app.js
+++ b/examples/live-tracker-map/pages/_app.js
@@ -12,10 +12,14 @@ function MyApp({ Component, pageProps }) {
         const authUser = auth.currentUser()
         if (!authUser) return
 
-        const { body: user } = await supabase.from('users')
+        const { data: user, error } = await supabase
+          .from('users')
           .match({ id: authUser.id })
           .select('*')
           .single()
+        if (error) {
+          throw new Error(error)
+        }
         setUser(user)
       } catch (error) {
         console.log(error)
@@ -26,15 +30,16 @@ function MyApp({ Component, pageProps }) {
 
   function onSignOut() {
     try {
-      const user = auth.currentUser();
-      user.signOut()
-        .then(response => {
-          console.log("User logged out")
+      const user = auth.currentUser()
+      user
+        .signOut()
+        .then((response) => {
+          console.log('User logged out')
           window.location.reload()
         })
-        .catch(error => {
-          console.log("Failed to logout user: %o", error)
-        });
+        .catch((error) => {
+          console.log('Failed to logout user: %o', error)
+        })
     } catch (error) {
       console.log(error)
     }
@@ -44,7 +49,7 @@ function MyApp({ Component, pageProps }) {
     <UserContext.Provider
       value={{
         user: user,
-        signOut: onSignOut
+        signOut: onSignOut,
       }}
     >
       <Component {...pageProps} />
diff --git a/examples/live-tracker-map/pages/api/auth/signup.js b/examples/live-tracker-map/pages/api/auth/signup.js
index 3cb09df1825..bc8e45048a8 100644
--- a/examples/live-tracker-map/pages/api/auth/signup.js
+++ b/examples/live-tracker-map/pages/api/auth/signup.js
@@ -7,7 +7,7 @@ export default async function (req, res) {
     const authBody = await auth.signUp({email, password})
 
     supabase.setAccessToken(authBody.data.access_token)
-    const { body: user } = await supabase.from('users').insert([{ id: authBody.user.id, username: email, role }]).single()
+    const { data: user } = await supabase.from('users').insert([{ id: authBody.user.id, username: email, role }]).single()
 
     return res.status(200).json({ ...user, refresh_token: authBody.refresh_token })
   } catch (error) {
diff --git a/examples/slack-clone/lib/Store.js b/examples/slack-clone/lib/Store.js
index 0235d19ee61..62f0d148b39 100644
--- a/examples/slack-clone/lib/Store.js
+++ b/examples/slack-clone/lib/Store.js
@@ -94,9 +94,9 @@ export const useStore = (props) => {
  */
 export const fetchChannels = async (setState) => {
   try {
-    let { body } = await supabase.from('channels').select('*')
-    if (setState) setState(body)
-    return body
+    let { data } = await supabase.from('channels').select('*')
+    if (setState) setState(data)
+    return data
   } catch (error) {
     console.log('error', error)
   }
@@ -109,8 +109,8 @@ export const fetchChannels = async (setState) => {
  */
 export const fetchUser = async (userId, setState) => {
   try {
-    let { body } = await supabase.from('users').eq('id', userId).select(`*`)
-    let user = body[0]
+    let { data } = await supabase.from('users').eq('id', userId).select(`*`)
+    let user = data[0]
     if (setState) setState(user)
     return user
   } catch (error) {
@@ -125,13 +125,13 @@ export const fetchUser = async (userId, setState) => {
  */
 export const fetchMessages = async (channelId, setState) => {
   try {
-    let { body } = await supabase
+    let { data } = await supabase
       .from('messages')
       .eq('channel_id', channelId)
       .select(`*, author:user_id(*)`)
       .order('inserted_at', true)
-    if (setState) setState(body)
-    return body
+    if (setState) setState(data)
+    return data
   } catch (error) {
     console.log('error', error)
   }
@@ -143,8 +143,8 @@ export const fetchMessages = async (channelId, setState) => {
  */
 export const addChannel = async (slug) => {
   try {
-    let { body } = await supabase.from('channels').insert([{ slug }])
-    return body
+    let { data } = await supabase.from('channels').insert([{ slug }])
+    return data
   } catch (error) {
     console.log('error', error)
   }
@@ -158,8 +158,8 @@ export const addChannel = async (slug) => {
  */
 export const addMessage = async (message, channel_id, user_id) => {
   try {
-    let { body } = await supabase.from('messages').insert([{ message, channel_id, user_id }])
-    return body
+    let { data } = await supabase.from('messages').insert([{ message, channel_id, user_id }])
+    return data
   } catch (error) {
     console.log('error', error)
   }
diff --git a/examples/slack-clone/pages/_app.js b/examples/slack-clone/pages/_app.js
index 94f062eb051..5ec74a31673 100644
--- a/examples/slack-clone/pages/_app.js
+++ b/examples/slack-clone/pages/_app.js
@@ -19,9 +19,9 @@ export default class SupabaseSlackClone extends App {
 
   signIn = async (id, username) => {
     try {
-      let { body } = await supabase.from('users').match({ username }).select('id, username')
-      const existing = body[0]
-      const { body: user } = existing?.id
+      let { data,error } = await supabase.from('users').match({ username }).select('id, username')
+      const existing = data[0]
+      const { data: user } = existing?.id
         ? await supabase.from('users').update({ id, username }).match({ id }).single()
         : await supabase.from('users').insert([{ id, username }]).single()
 
diff --git a/examples/todo-next-js/components/TodoList.js b/examples/todo-next-js/components/TodoList.js
index a0536a4c915..039e7b7febf 100644
--- a/examples/todo-next-js/components/TodoList.js
+++ b/examples/todo-next-js/components/TodoList.js
@@ -71,12 +71,15 @@ const Todo = ({ todo, onDelete }) => {
 
   const toggle = async () => {
     try {
-      const { body } = await supabase
+      const { data,error } = await supabase
         .from('todos')
         .update({ is_complete: !isCompleted })
         .eq('id', todo.id)
         .single()
-      setIsCompleted(body.is_complete)
+        if(error){
+          throw new Error(error)
+        }
+      setIsCompleted(data.is_complete)
     } catch (error) {
       console.log('error', error)
     }
diff --git a/examples/todo/src/Store.js b/examples/todo/src/Store.js
index c71b6de0214..2a7e4b12f9d 100644
--- a/examples/todo/src/Store.js
+++ b/examples/todo/src/Store.js
@@ -34,10 +34,10 @@ export const useStore = (props) => {
           }
         })
         if (update) {
-          setTasks(t => [...tasks]) // update
+          setTasks((t) => [...tasks]) // update
         } else {
           tasks.unshift(newTask)
-          setTasks(t => [...tasks]) // new
+          setTasks((t) => [...tasks]) // new
         }
       }
     }
@@ -61,8 +61,11 @@ export const useStore = (props) => {
 
 export const addTask = async (task_text, list_id) => {
   try {
-    let { body } = await supabase.from('tasks').insert([{ task_text, list_id }])
-    return body
+    let { data, error } = await supabase.from('tasks').insert([{ task_text, list_id }])
+    if (error) {
+      throw new Error(error)
+    }
+    return data
   } catch (error) {
     console.log('error', error)
   }
@@ -70,8 +73,11 @@ export const addTask = async (task_text, list_id) => {
 
 export const updateTask = async (task_id, values) => {
   try {
-    let { body } = await supabase.from('tasks').eq('id', task_id).update(values)
-    return body
+    let { data, error } = await supabase.from('tasks').eq('id', task_id).update(values)
+    if (error) {
+      throw new Error(error)
+    }
+    return data
   } catch (error) {
     console.log('error', error)
   }
@@ -79,8 +85,11 @@ export const updateTask = async (task_id, values) => {
 
 export const createList = async (uuid) => {
   try {
-    let { body } = await supabase.from('lists').insert([{ uuid }])
-    return body[0]
+    let { data, error } = await supabase.from('lists').insert([{ uuid }])
+    if (error) {
+      throw new Error(error)
+    }
+    return data[0]
   } catch (error) {
     console.log('error', error)
   }
@@ -88,12 +97,15 @@ export const createList = async (uuid) => {
 
 export const fetchList = async (list_uuid) => {
   try {
-    let { body } = await supabase
+    let { data, error } = await supabase
       .from('lists')
       .eq('uuid', list_uuid)
       .select(`*, tasks(*)`)
       .single()
-    return body
+    if (error) {
+      throw new Error(error)
+    }
+    return data
   } catch (error) {
     console.log('error', error)
   }