diff --git a/src/app/store/products/products.component.html b/src/app/store/products/products.component.html
index 6374b4b..e17dcfa 100644
--- a/src/app/store/products/products.component.html
+++ b/src/app/store/products/products.component.html
@@ -5,7 +5,7 @@
                 <div class="row">
                     <div class="col-12 col-md-3">
                         <slideshow [autoPlay]="true" [imageUrls]="preview" [height]="'300px'"></slideshow>
-                        <div *ngIf="links.length">
+                        <div *ngIf="links?.length">
                             <h5 class="mt-3 mb-0 pl-3">Links</h5>
                             <mat-list>
                                 <mat-list-item *ngFor="let l of links">
@@ -21,7 +21,7 @@
                         <mat-divider class="my-3"></mat-divider>
                         <p style="overflow: hidden;" [innerHtml]="product.description"></p>
                         <mat-divider class="my-3"></mat-divider>
-                        <div *ngIf="attachments.length">
+                        <div *ngIf="attachments?.length">
                             <h5 class="ml-3">
                                 <mat-icon style="vertical-align: bottom;">cloud_download</mat-icon> Downloads
                             </h5>
diff --git a/src/app/store/products/products.component.ts b/src/app/store/products/products.component.ts
index 92096f9..9e78e73 100644
--- a/src/app/store/products/products.component.ts
+++ b/src/app/store/products/products.component.ts
@@ -29,12 +29,13 @@ export class ProductsComponent {
         this.product = data[0];
 
         this.preview = [this.product.originalImage];
-        this.preview = this.preview.concat(
-          this.product.files.filter(row => row.type == 'preview').map(row => row.link)
-        );
-
-        this.links = this.product.files.filter(row => row.type == 'link');
-        this.attachments = this.product.files.filter(row => row.type == 'other');
+        if (this.product.files) {
+          this.preview = this.preview.concat(
+            this.product.files.filter(row => row.type == 'preview').map(row => row.link)
+          );
+          this.links = this.product.files.filter(row => row.type == 'link');
+          this.attachments = this.product.files.filter(row => row.type == 'other');
+        }
       });
     });
   }