From 3c98ca61ac1eeab90cb18a1081fd4393fb119c6a Mon Sep 17 00:00:00 2001
From: ProPuke <ProPuke@gmail.com>
Date: Sat, 13 Jun 2015 05:26:17 +0100
Subject: [PATCH] fixed: html5 runtime errors loading missing assets

---
 .../compatibility/DefaultAssetLibrary.hx      | 20 +++++++++++++++++--
 templates/haxe/DefaultAssetLibrary.hx         | 20 +++++++++++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/templates/compatibility/DefaultAssetLibrary.hx b/templates/compatibility/DefaultAssetLibrary.hx
index c6c8af7e5..3f2799221 100644
--- a/templates/compatibility/DefaultAssetLibrary.hx
+++ b/templates/compatibility/DefaultAssetLibrary.hx
@@ -204,7 +204,15 @@ class DefaultAssetLibrary extends AssetLibrary {
 		#elseif (js || openfl_html5 || pixi)
 		
 		var bytes:ByteArray = null;
-		var data = ApplicationMain.urlLoaders.get (path.get (id)).data;
+		var loader = ApplicationMain.urlLoaders.get (path.get (id));
+
+		if (loader = null) {
+
+			return null;
+			
+		}
+
+		var data = loader.data;
 		
 		if (Std.is (data, String)) {
 			
@@ -339,7 +347,15 @@ class DefaultAssetLibrary extends AssetLibrary {
 		#if js
 		
 		var bytes:ByteArray = null;
-		var data = ApplicationMain.urlLoaders.get (path.get (id)).data;
+		var loader = ApplicationMain.urlLoaders.get (path.get (id));
+
+		if (loader = null) {
+
+			return null;
+
+		}
+
+		var data = loader.data;
 		
 		if (Std.is (data, String)) {
 			
diff --git a/templates/haxe/DefaultAssetLibrary.hx b/templates/haxe/DefaultAssetLibrary.hx
index 686c2d333..ff1228ea1 100644
--- a/templates/haxe/DefaultAssetLibrary.hx
+++ b/templates/haxe/DefaultAssetLibrary.hx
@@ -219,7 +219,15 @@ class DefaultAssetLibrary extends AssetLibrary {
 		#elseif html5
 		
 		var bytes:ByteArray = null;
-		var data = Preloader.loaders.get (path.get (id)).data;
+		var loader = Preloader.loaders.get (path.get (id));
+
+		if (loader == null) {
+
+			return null;
+
+		}
+
+		var data = loader.data;
 		
 		if (Std.is (data, String)) {
 			
@@ -366,7 +374,15 @@ class DefaultAssetLibrary extends AssetLibrary {
 		#if html5
 		
 		var bytes:ByteArray = null;
-		var data = Preloader.loaders.get (path.get (id)).data;
+		var loader = Preloader.loaders.get (path.get (id));
+
+		if (loader == null) {
+
+			return null;
+			
+		}
+
+		var data = loader.data;
 		
 		if (Std.is (data, String)) {