diff --git a/src/index.ts b/src/index.ts
index dc1428d0..80f10426 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,2 +1,3 @@
 export { Chart } from './components/Chart'
 export * from './types'
+export { default as useChartContext } from './utils/chartContext'
diff --git a/src/utils/chartContext.tsx b/src/utils/chartContext.tsx
index 16f3bee7..2fb24103 100644
--- a/src/utils/chartContext.tsx
+++ b/src/utils/chartContext.tsx
@@ -15,5 +15,8 @@ export function ChartContextProvider<TDatum>({
 }
 
 export default function useChartContext<TDatum>() {
-  return React.useContext(chartContext)() as ChartContextValue<TDatum>
+  const ctx = React.useContext(chartContext)() as ChartContextValue<TDatum>
+  if (!ctx)
+    throw new Error('useChartContext can only be used within a Chart Provider')
+  return ctx as ChartContextValue<TDatum>
 }