diff --git a/lib/src/providers/service_provider.dart b/lib/src/providers/service_provider.dart
index a0d88e0..68856ec 100644
--- a/lib/src/providers/service_provider.dart
+++ b/lib/src/providers/service_provider.dart
@@ -50,13 +50,8 @@ class ArcaneServiceProvider extends InheritedNotifier {
   /// ```dart
   /// final provider = ArcaneServiceProvider.of(context);
   /// ```
-  static ArcaneServiceProvider of(BuildContext context) {
-    try {
-      return context
-          .dependOnInheritedWidgetOfExactType<ArcaneServiceProvider>()!;
-    } catch (e) {
-      throw Exception("ArcaneServiceProvider not found in context");
-    }
+  static ArcaneServiceProvider? of(BuildContext context) {
+    return context.dependOnInheritedWidgetOfExactType<ArcaneServiceProvider>();
   }
 }
 
diff --git a/test/providers/service_provider_test.dart b/test/providers/service_provider_test.dart
index 44a5b05..aba83ee 100644
--- a/test/providers/service_provider_test.dart
+++ b/test/providers/service_provider_test.dart
@@ -20,7 +20,7 @@ void main() {
           child: Builder(
             builder: (context) {
               final provider = ArcaneServiceProvider.of(context);
-              expect(provider.serviceInstances, equals(testServices));
+              expect(provider?.serviceInstances, equals(testServices));
               return const SizedBox();
             },
           ),