diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44b5bf9c1..98e8d8da9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# v1.1.x
+## 11/xx/2016
+
+1. [](#improved)
+    * Multisite: Create image cache folder if it doesn't exist
+    * Add 2 new language values for French [#1174](https://github.com/getgrav/grav/issues/1174)
+1. [](#bugfix)
+    * Fixed issue when we have a meta file without corresponding media [#1179](https://github.com/getgrav/grav/issues/1179)
+
 # v1.1.9-rc.1
 ## 11/09/2016
 
diff --git a/system/src/Grav/Common/Page/Media.php b/system/src/Grav/Common/Page/Media.php
index 35baab6ab..16dfdf313 100644
--- a/system/src/Grav/Common/Page/Media.php
+++ b/system/src/Grav/Common/Page/Media.php
@@ -75,6 +75,9 @@ class Media extends Getters
 
             // Create the base medium
             if (empty($types['base'])) {
+                if (!isset($types['alternative'])) {
+                    continue;
+                }
                 $max = max(array_keys($types['alternative']));
                 $medium = $types['alternative'][$max]['file'];
                 $medium = MediumFactory::scaledFromMedium($medium, $max, 1)['file'];