diff --git a/demo/src/demo/Demo.hx b/demo/src/demo/Demo.hx
index 50a0d6d..51a352c 100644
--- a/demo/src/demo/Demo.hx
+++ b/demo/src/demo/Demo.hx
@@ -1,5 +1,6 @@
 package demo;
 
+import haxework.resources.IResources;
 import haxework.provider.Provider;
 import demo.dispatch.DemoDispatcher;
 import demo.popup.ColorPopup;
@@ -43,13 +44,13 @@ import haxework.view.group.VGroupView;
 
 class Demo extends App implements DemoListener {
 
+    @:provide static var resources:IResources;
+
     public static function main() {
         L.push(new TraceLogger());
 
-        trace("!", Provider.instance.factories);
-
         var app = new Demo(new AppTheme());
-        app.resources.image.put("logo", HaxeLogo.resolve());
+        resources.image.put("logo", HaxeLogo.resolve());
         app.start(new DemoView());
 
         var dispatcher = new DemoDispatcher();
@@ -66,8 +67,8 @@ class Demo extends App implements DemoListener {
 
         new JsonLoader().GET("https://embed.tvbit.co/channel/data2/renova.json")
         .then(function(data:Array<Model>) {
-            app.resources.any.put("data", data);
-            app.resources.any.put("data50", Util.marray(data, 50));
+            resources.any.put("data", data);
+            resources.any.put("data50", Util.marray(data, 50));
         })
         .catchError(function(error) trace(error));
     }
diff --git a/demo/src/demo/dispatch/DemoDispatcher.hx b/demo/src/demo/dispatch/DemoDispatcher.hx
index cc64886..261715c 100644
--- a/demo/src/demo/dispatch/DemoDispatcher.hx
+++ b/demo/src/demo/dispatch/DemoDispatcher.hx
@@ -9,6 +9,6 @@ interface DemoListener {
     public function onTest4(app:App):Void;
 }
 
-@:yield @:dispatcher(DemoListener) class DemoDispatcher {
+@:dispatcher(DemoListener) class DemoDispatcher {
     public function new() {}
 }
diff --git a/src/main/haxework/provider/Provider.hx b/src/main/haxework/provider/Provider.hx
index 6e18cf5..086b9fa 100755
--- a/src/main/haxework/provider/Provider.hx
+++ b/src/main/haxework/provider/Provider.hx
@@ -65,8 +65,7 @@ abstract KeyType<T>(String) {
             instances.set(key, instance);
             return instance;
         } else {
-            return null;
-            //throw 'Factory for "${key}" not found';
+            throw 'Factory for "${key}" not found';
         }
     }