diff --git a/packages/api/src/proc/databaseConnectionProcess.js b/packages/api/src/proc/databaseConnectionProcess.js
index 984aa9fc6..95fb14742 100644
--- a/packages/api/src/proc/databaseConnectionProcess.js
+++ b/packages/api/src/proc/databaseConnectionProcess.js
@@ -83,8 +83,12 @@ function waitConnected() {
 async function handleQueryData({ msgid, sql }) {
   await waitConnected();
   const driver = engines(storedConnection);
-  const res = await driver.query(systemConnection, sql);
-  process.send({ msgtype: 'response', msgid, ...res });
+  try {
+    const res = await driver.query(systemConnection, sql);
+    process.send({ msgtype: 'response', msgid, ...res });
+  } catch (err) {
+    process.send({ msgtype: 'response', msgid, errorMessage: err.message });
+  }
 }
 
 // async function handleRunCommand({ msgid, sql }) {
diff --git a/packages/web/src/datagrid/DataGridCore.js b/packages/web/src/datagrid/DataGridCore.js
index b41f1e0b6..7571583e3 100644
--- a/packages/web/src/datagrid/DataGridCore.js
+++ b/packages/web/src/datagrid/DataGridCore.js
@@ -39,6 +39,7 @@ import { showMenu } from '../modals/DropDownMenu';
 import DataGridContextMenu from './DataGridContextMenu';
 import useSocket from '../utility/SocketProvider';
 import LoadingInfo from '../widgets/LoadingInfo';
+import ErrorInfo from '../widgets/ErrorInfo';
 
 const GridContainer = styled.div`
   position: absolute;
@@ -148,6 +149,7 @@ async function loadDataPage(props, offset, limit) {
     data: { sql },
   });
 
+  if (response.data.errorMessage) return response.data;
   return response.data.rows;
 }
 
@@ -203,8 +205,9 @@ export default function DataGridCore(props) {
     isLoadedAll: false,
     loadedTime: new Date().getTime(),
     allRowCount: null,
+    errorMessage: null,
   });
-  const { isLoading, loadedRows, isLoadedAll, loadedTime, allRowCount } = loadProps;
+  const { isLoading, loadedRows, isLoadedAll, loadedTime, allRowCount, errorMessage } = loadProps;
 
   const loadedTimeRef = React.useRef(0);
   const focusFieldRef = React.useRef();
@@ -269,17 +272,25 @@ export default function DataGridCore(props) {
     //   nextRows = [];
     // }
     // console.log('nextRows', nextRows);
-    if (allRowCount == null) handleLoadRowCount();
-    const loadedInfo = {
-      loadedRows: [...loadedRows, ...nextRows],
-      loadedTime,
-      isLoadedAll: nextRows.length === 0,
-    };
-    setLoadProps((oldLoadProps) => ({
-      ...oldLoadProps,
-      isLoading: false,
-      ...loadedInfo,
-    }));
+    if (nextRows.errorMessage) {
+      setLoadProps((oldLoadProps) => ({
+        ...oldLoadProps,
+        isLoading: false,
+        errorMessage: nextRows.errorMessage,
+      }));
+    } else {
+      if (allRowCount == null) handleLoadRowCount();
+      const loadedInfo = {
+        loadedRows: [...loadedRows, ...nextRows],
+        loadedTime,
+        isLoadedAll: nextRows.length === 0,
+      };
+      setLoadProps((oldLoadProps) => ({
+        ...oldLoadProps,
+        isLoading: false,
+        ...loadedInfo,
+      }));
+    }
   };
 
   // const data = useFetch({
@@ -361,12 +372,14 @@ export default function DataGridCore(props) {
       loadedRows: [],
       isLoadedAll: false,
       loadedTime: new Date().getTime(),
+      errorMessage: null,
     });
   };
 
   React.useEffect(() => {
     if (
       !isLoadedAll &&
+      !errorMessage &&
       firstVisibleRowScrollIndex + visibleRowCountUpperBound >= loadedRows.length &&
       insertedRows.length == 0
     ) {
@@ -455,6 +468,10 @@ export default function DataGridCore(props) {
       </LoadingInfoWrapper>
     );
 
+  if (errorMessage) {
+    return <ErrorInfo message={errorMessage} />;
+  }
+
   const insertedRows = getChangeSetInsertedRows(changeSet, display.baseTable);
   const rowCountNewIncluded = loadedRows.length + insertedRows.length;
 
diff --git a/packages/web/src/widgets/ErrorInfo.js b/packages/web/src/widgets/ErrorInfo.js
new file mode 100644
index 000000000..dcf4e469e
--- /dev/null
+++ b/packages/web/src/widgets/ErrorInfo.js
@@ -0,0 +1,26 @@
+import React from 'react';
+
+import styled from 'styled-components';
+
+const Container = styled.div`
+  display: flex;
+  align-items: center;
+  margin-right: 10px;
+`;
+
+const Icon = styled.div`
+  font-size: 20pt;
+  margin: 10px;
+  color: red;
+`;
+
+export default function ErrorInfo({ message }) {
+  return (
+    <Container>
+      <Icon>
+        <i className="fas fa-times-circle" />
+      </Icon>
+      {message}
+    </Container>
+  );
+}