diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
index 10aa5bbebd..5c12354c2a 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
@@ -157,9 +157,11 @@ export class DocumentList implements OnInit, AfterContentInit {
         private translate: AlfrescoTranslationService) {
 
         let rootPath = './..';
-        if (module && module.id) {
-            rootPath = module.id.replace('/components/document-list.js', '');
-        }
+        try {
+            if (module && module.id) {
+                rootPath = module.id.replace('/components/document-list.js', '');
+            }
+        } catch (e) {}
 
         this.data = new ShareDataTableAdapter(this.documentListService, rootPath, []);
 
@@ -171,18 +173,17 @@ export class DocumentList implements OnInit, AfterContentInit {
     }
 
     resolveIconPath(icon: string): string {
-        let result = null;
         try {
             // webpack
-            result = require(`./../img/${icon}`);
+            return require(`./../img/${icon}`);
         } catch (e) {
             // system.js
             if (module && module.id) {
                 let baseComponentPath = module.id.replace('/components/document-list.js', '');
-                result = `${baseComponentPath}/img/${icon}`;
+                return `${baseComponentPath}/img/${icon}`;
             }
         }
-        return result;
+        return null;
     }
 
     getContextActions(node: MinimalNodeEntity) {
diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts
index 0c3d21f0c2..04b3e73205 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts
@@ -313,17 +313,16 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid
     }
 
     getImagePath(id: string): any {
-        let result = null;
         try {
             // webpack
-            result = require(`${this.basePath}/img/${id}`);
+            return require(`./../img/${id}`);
         } catch (e) {
             // system.js
             if (module && module.id) {
-                result = `${this.basePath}/img/${id}`;
+                return `${this.basePath}/img/${id}`;
             }
         }
-        return result;
+        return null;
     }
 
     private resetPagination() {