diff --git a/documentation/docs/05-changelog.md b/documentation/docs/05-changelog.md
index 305f3dfad..75cc2064c 100644
--- a/documentation/docs/05-changelog.md
+++ b/documentation/docs/05-changelog.md
@@ -1,10 +1,11 @@
-## CHANGELOG
+## CHANGELOG
  ### v.1.4.3
 *??/??/2018*
 ##### New Features
 ##### Improvements
 ##### Bug Fixes
-- Fix issue with UvModifier where it calculates roof uv positions wrong
+- Fix issue with UvModifier which caused wrong roof uv positions calculations.
+- Fix issue with data fetcher to handle failed connections properly, which caused IndexOutOfRangeException during tile loading/unloading.
 
 
  ### v.1.4.2
diff --git a/sdkproject/Assets/Mapbox/Unity/Editor/VectorSubLayerTreeView.cs.meta b/sdkproject/Assets/Mapbox/Unity/Editor/VectorSubLayerTreeView.cs.meta
new file mode 100644
index 000000000..bffbd132f
--- /dev/null
+++ b/sdkproject/Assets/Mapbox/Unity/Editor/VectorSubLayerTreeView.cs.meta
@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+guid: e597f3da0a26e469584070315e18e4f1
+timeCreated: 1526503584
+licenseType: Pro
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/ImageDataFetcher.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/ImageDataFetcher.cs
index a3cce4495..177cb84fb 100644
--- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/ImageDataFetcher.cs
+++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/ImageDataFetcher.cs
@@ -29,10 +29,11 @@ public void FetchImage(CanonicalTileId canonicalTileId, string mapid, UnityTile
 			if (rasterTile.HasError)
 			{
 				FetchingError(tile, new TileErrorEventArgs(tile.CanonicalTileId, rasterTile.GetType(), tile, rasterTile.Exceptions));
-				return;
 			}
-
-			DataRecieved(tile, rasterTile);
+			else
+			{
+				DataRecieved(tile, rasterTile);
+			}
 		});
 	}
 }
diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainDataFetcher.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainDataFetcher.cs
index 43a499930..df6d0d534 100644
--- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainDataFetcher.cs
+++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainDataFetcher.cs
@@ -22,7 +22,7 @@ public class TerrainDataFetcher : DataFetcher
 	public Action<UnityTile, TileErrorEventArgs> FetchingError = (t, s) => { };
 
 	//tile here should be totally optional and used only not to have keep a dictionary in terrain factory base
-	public void FetchTerrain(CanonicalTileId canonicalTileId, string mapid, UnityTile tile = null) 
+	public void FetchTerrain(CanonicalTileId canonicalTileId, string mapid, UnityTile tile = null)
 	{
 		var pngRasterTile = new RawPngRasterTile();
 		pngRasterTile.Initialize(_fileSource, canonicalTileId, mapid, () =>
@@ -31,8 +31,10 @@ public void FetchTerrain(CanonicalTileId canonicalTileId, string mapid, UnityTil
 			{
 				FetchingError(tile, new TileErrorEventArgs(canonicalTileId, pngRasterTile.GetType(), null, pngRasterTile.Exceptions));
 			}
-
-			DataRecieved(tile, pngRasterTile);
+			else
+			{
+				DataRecieved(tile, pngRasterTile);
+			}
 		});
 	}
 }
diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/VectorDataFetcher.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/VectorDataFetcher.cs
index d731dfac8..412fdc6e1 100644
--- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/VectorDataFetcher.cs
+++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/VectorDataFetcher.cs
@@ -19,10 +19,11 @@ public void FetchVector(CanonicalTileId canonicalTileId, string mapid, UnityTile
 			{
 				FetchingError(tile, new TileErrorEventArgs(tile.CanonicalTileId, vectorTile.GetType(), tile, vectorTile.Exceptions));
 				tile.VectorDataState = TilePropertyState.Error;
-				return;
 			}
-
-			DataRecieved(tile, vectorTile);
+			else
+			{
+				DataRecieved(tile, vectorTile);
+			}
 		});
 	}
 }