diff --git a/src/apis/StorageController.php b/src/apis/StorageController.php
index 9705dbf15..83987be31 100644
--- a/src/apis/StorageController.php
+++ b/src/apis/StorageController.php
@@ -253,6 +253,10 @@ public function actionImageInfo($id)
             throw new NotFoundHttpException("Unable to find the given storage image.");
         }
 
+        if (!$model->file->isImage) {
+            return $model->toArray(['id', 'source', 'file_id', 'filter_id', 'resolution_width', 'resolution_height', 'file'], ['source']);
+        }
+
         // try to create thumbnail on view if not done
         if (empty($model->tinyCropImage)) {
             // there are very rare cases where the thumbnail does not exists, therefore generate the thumbnail and reload the model.
diff --git a/src/views/layouts/_angulardirectives.php b/src/views/layouts/_angulardirectives.php
index 74522a81b..0a6e2b6f0 100644
--- a/src/views/layouts/_angulardirectives.php
+++ b/src/views/layouts/_angulardirectives.php
@@ -167,7 +167,7 @@
         <div class="imageupload-preview" ng-show="imageinfo != null">
             <div class="imageupload-preview-sizer"></div>
             <img ng-src="{{thumb.source}}" ng-show="imageinfo != null" class="imageupload-preview-image" />
-            <div class="imageupload-infos">
+            <div class="imageupload-infos" ng-if="imageinfo != null && imageinfo.resolution_width && imageinfo.resolution_height">
                 <div class="imageupload-size" ng-show="!imageLoading">{{ imageinfo.resolution_width }} x {{ imageinfo.resolution_height }}</div>
             </div>
         </div>
@@ -175,7 +175,7 @@
             <storage-file-upload ng-model="fileId"></storage-file-upload>
         </div>
         <?php if (Yii::$app->adminuser->canRoute('admin/storage/index')): ?>
-        <div class="imageupload-filter" ng-show="!noFilters() && imageinfo != null">
+        <div class="imageupload-filter" ng-show="!noFilters() && imageinfo != null && imageinfo.resolution_width && imageinfo.resolution_height">
             <select name="filterId" ng-model="filterId" ng-change="changeFilter()" convert-to-number>
                 <option value="0"><?= Admin::t('layout_no_filter'); ?></option>
                 <option ng-repeat="item in filtersData" value="{{ item.id }}">{{ item.name }} ({{ item.identifier }})</option>
diff --git a/tests/admin/ngrest/plugins/FileTest.php b/tests/admin/ngrest/plugins/FileTest.php
index ff75fe40c..f8e20d34b 100644
--- a/tests/admin/ngrest/plugins/FileTest.php
+++ b/tests/admin/ngrest/plugins/FileTest.php
@@ -4,7 +4,6 @@
 
 use admintests\AdminTestCase;
 use admintests\data\fixtures\UserFixture;
-
 use luya\admin\ngrest\plugins\File;
 use yii\base\Event;
 
diff --git a/tests/admin/ngrest/plugins/ImageArrayTest.php b/tests/admin/ngrest/plugins/ImageArrayTest.php
index 69adcf62a..825cedf69 100644
--- a/tests/admin/ngrest/plugins/ImageArrayTest.php
+++ b/tests/admin/ngrest/plugins/ImageArrayTest.php
@@ -3,7 +3,6 @@
 namespace admintests\admin\ngrest\plugins;
 
 use admintests\AdminTestCase;
-
 use admintests\data\fixtures\UserFixture;
 use luya\admin\ngrest\plugins\ImageArray;
 use Yii;
diff --git a/tests/admin/ngrest/plugins/ImageTest.php b/tests/admin/ngrest/plugins/ImageTest.php
index 8d52f63de..5920bea34 100644
--- a/tests/admin/ngrest/plugins/ImageTest.php
+++ b/tests/admin/ngrest/plugins/ImageTest.php
@@ -3,7 +3,6 @@
 namespace admintests\admin\ngrest\plugins;
 
 use admintests\AdminTestCase;
-
 use admintests\data\fixtures\UserFixture;
 use luya\admin\ngrest\plugins\Image;
 use yii\base\Event;
diff --git a/tests/admin/ngrest/plugins/LinkTest.php b/tests/admin/ngrest/plugins/LinkTest.php
index db9142917..5cf656c63 100644
--- a/tests/admin/ngrest/plugins/LinkTest.php
+++ b/tests/admin/ngrest/plugins/LinkTest.php
@@ -4,7 +4,6 @@
 
 use admintests\AdminTestCase;
 use admintests\data\fixtures\UserFixture;
-
 use luya\admin\ngrest\plugins\Link;
 use yii\base\Event;