diff --git a/frontend/src/Editor/LeftSidebar/SidebarDebugger.jsx b/frontend/src/Editor/LeftSidebar/SidebarDebugger.jsx
index 8c6cc07c06..bb52d6cb38 100644
--- a/frontend/src/Editor/LeftSidebar/SidebarDebugger.jsx
+++ b/frontend/src/Editor/LeftSidebar/SidebarDebugger.jsx
@@ -46,6 +46,10 @@ export const LeftSidebarDebugger = ({ darkMode, errors }) => {
             variableNames.options = 'substitutedVariables';
             variableNames.response = 'response';
             break;
+
+          case 'transformations':
+            variableNames.response = 'data';
+            break;
           default:
             'options';
         }
@@ -168,27 +172,28 @@ function ErrorLogsComponent({ errorProps, idx, darkMode }) {
           height="16"
         />
         [{_.capitalize(errorProps.type)} {errorProps.key}]  
-        <span className="text-red">
-          {`Query Failed: ${errorProps.description}`} {errorProps.message}.
-        </span>
+        <span className="text-red">{`${_.startCase(errorProps.type)} Failed: ${errorProps.message}`} .</span>
         <br />
         <small className="text-muted px-1">{moment(errorProps.timestamp).fromNow()}</small>
       </p>
+
       <div className={` queryData ${open ? 'open' : 'close'} py-0`}>
-        <span>
-          <ReactJson
-            src={errorProps.options.data}
-            theme={darkMode ? 'shapeshifter' : 'rjv-default'}
-            name={errorProps.options.name}
-            style={{ fontSize: '0.7rem', paddingLeft: '0.17rem' }}
-            enableClipboard={false}
-            displayDataTypes={false}
-            collapsed={true}
-            displayObjectSize={false}
-            quotesOnKeys={false}
-            sortKeys={false}
-          />
-        </span>
+        {errorProps.type === 'query' && (
+          <span>
+            <ReactJson
+              src={errorProps.options.data}
+              theme={darkMode ? 'shapeshifter' : 'rjv-default'}
+              name={errorProps.options.name}
+              style={{ fontSize: '0.7rem', paddingLeft: '0.17rem' }}
+              enableClipboard={false}
+              displayDataTypes={false}
+              collapsed={true}
+              displayObjectSize={false}
+              quotesOnKeys={false}
+              sortKeys={false}
+            />
+          </span>
+        )}
         <span>
           <ReactJson
             src={errorProps.response.data}
diff --git a/frontend/src/_helpers/appUtils.js b/frontend/src/_helpers/appUtils.js
index f1d0928311..150bca0d0f 100644
--- a/frontend/src/_helpers/appUtils.js
+++ b/frontend/src/_helpers/appUtils.js
@@ -56,7 +56,7 @@ export function runTransformation(_ref, rawData, transformation, query) {
     result = evalFunction(data, moment, _, currentState.components, currentState.queries, currentState.globals);
   } catch (err) {
     console.log('Transformation failed for query: ', query.name, err);
-    toast.error(err.message, { hideProgressBar: true });
+    result = { message: err.stack.split('\n')[0], status: 'failed', data: data };
   }
 
   return result;
@@ -451,6 +451,34 @@ export function runQuery(_ref, queryId, queryName, confirmed = undefined) {
 
           if (dataQuery.options.enableTransformation) {
             finalData = runTransformation(_self, rawData, dataQuery.options.transformation, dataQuery);
+            if (finalData.status === 'failed') {
+              return _self.setState(
+                {
+                  currentState: {
+                    ..._self.state.currentState,
+                    queries: {
+                      ..._self.state.currentState.queries,
+                      [queryName]: {
+                        ..._self.state.currentState.queries[queryName],
+                        isLoading: false,
+                      },
+                    },
+                    errors: {
+                      ..._self.state.currentState.errors,
+                      [queryName]: {
+                        type: 'transformations',
+                        data: finalData,
+                        options: options,
+                      },
+                    },
+                  },
+                },
+                () => {
+                  resolve();
+                  onEvent(_self, 'onDataQueryFailure', { definition: { events: dataQuery.options.events } });
+                }
+              );
+            }
           }
 
           if (dataQuery.options.showSuccessNotification) {