diff --git a/bootstraped-multi-test-results-report/pom.xml b/bootstraped-multi-test-results-report/pom.xml
index 90cc5f8..531c410 100644
--- a/bootstraped-multi-test-results-report/pom.xml
+++ b/bootstraped-multi-test-results-report/pom.xml
@@ -15,7 +15,7 @@
   <packaging>hpi</packaging>
   <properties>
     <cucumber-reporting-handlebars.version>1.1.6</cucumber-reporting-handlebars.version>
-    <junit-reporting-handlebars.version>1.0.9</junit-reporting-handlebars.version>
+    <junit-reporting-handlebars.version>1.0.10</junit-reporting-handlebars.version>
     <testng-reporting-handlebars.version>1.0.9</testng-reporting-handlebars.version>
     <rspec-reporting-handlebars.version>1.0.6</rspec-reporting-handlebars.version>
   </properties>
diff --git a/junit-reporting-handlebars/src/main/java/com/github/bogdanlivadariu/reporting/junit/xml/models/TestSuiteModel.java b/junit-reporting-handlebars/src/main/java/com/github/bogdanlivadariu/reporting/junit/xml/models/TestSuiteModel.java
index 7c2eb93..68e518e 100644
--- a/junit-reporting-handlebars/src/main/java/com/github/bogdanlivadariu/reporting/junit/xml/models/TestSuiteModel.java
+++ b/junit-reporting-handlebars/src/main/java/com/github/bogdanlivadariu/reporting/junit/xml/models/TestSuiteModel.java
@@ -1,5 +1,6 @@
 package com.github.bogdanlivadariu.reporting.junit.xml.models;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -57,7 +58,7 @@ public void postProcess() {
             int errorsCount = 0;
             Double totalTime = 0.0;
 
-            for (TestCaseModel test : testcase) {
+            for (TestCaseModel test : getTestcase()) {
                 if (test.getOverallStatus().equals(Constants.FAILED)) {
                     failuresCount++;
                 } else if (test.getOverallStatus().equals(Constants.ERRORED)) {
@@ -76,7 +77,7 @@ public void postProcess() {
                 skipped = Integer.toString(skippedCount);
             }
             if (tests == null) {
-                tests = Integer.toString(testcase.size());
+                tests = Integer.toString(getTestcase().size());
             }
             if (time == null) {
                 time = Double.toString(totalTime);
@@ -122,11 +123,11 @@ public String getName() {
     }
 
     public List<PropertyModel> getProperties() {
-        return properties;
+        return properties == null ? new ArrayList<PropertyModel>() : properties;
     }
 
     public List<TestCaseModel> getTestcase() {
-        return testcase;
+        return testcase == null ? new ArrayList<TestCaseModel>() : testcase;
     }
 
     public String getOverallStatus() {
diff --git a/junit-reporting-handlebars/src/main/java/com/github/bogdanlivadariu/reporting/junit/xml/models/TestSuitesModel.java b/junit-reporting-handlebars/src/main/java/com/github/bogdanlivadariu/reporting/junit/xml/models/TestSuitesModel.java
index 13e4ee3..38dc41d 100644
--- a/junit-reporting-handlebars/src/main/java/com/github/bogdanlivadariu/reporting/junit/xml/models/TestSuitesModel.java
+++ b/junit-reporting-handlebars/src/main/java/com/github/bogdanlivadariu/reporting/junit/xml/models/TestSuitesModel.java
@@ -1,5 +1,6 @@
 package com.github.bogdanlivadariu.reporting.junit.xml.models;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -48,7 +49,7 @@ public void postProcess() {
             int errorsCount = 0;
             Double totalTime = 0.0;
 
-            for (TestSuiteModel suite : testsuite) {
+            for (TestSuiteModel suite : getTestsuite()) {
                 if (suite.getOverallStatus().equals(Constants.FAILED)) {
                     failuresCount++;
                 } else if (suite.getOverallStatus().equals(Constants.ERRORED)) {
@@ -62,7 +63,7 @@ public void postProcess() {
                 failures = Integer.toString(failuresCount);
             }
             if (tests == null) {
-                tests = Integer.toString(testsuite.size());
+                tests = Integer.toString(getTestsuite().size());
             }
             if (time == null) {
                 time = Double.toString(totalTime);
@@ -104,7 +105,7 @@ public String getName() {
     }
 
     public List<TestSuiteModel> getTestsuite() {
-        return testsuite;
+        return testsuite == null ? new ArrayList<TestSuiteModel>() : testsuite;
     }
 
     public String getOverallStatus() {
diff --git a/pom.xml b/pom.xml
index 430965a..77924fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
   <properties>
     <parent.version>1.4.23</parent.version>
     <cucumber-reporting-handlebars.version>1.1.6</cucumber-reporting-handlebars.version>
-    <junit-reporting-handlebars.version>1.0.9</junit-reporting-handlebars.version>
+    <junit-reporting-handlebars.version>1.0.10</junit-reporting-handlebars.version>
     <testng-reporting-handlebars.version>1.0.9</testng-reporting-handlebars.version>
     <rspec-reporting-handlebars.version>1.0.6</rspec-reporting-handlebars.version>
     <e2e-reporting.version>1.0.0</e2e-reporting.version>
@@ -51,7 +51,7 @@
     <module>junit-reporting-handlebars</module>
     <module>testng-reporting-handlebars</module>
     <module>rspec-reporting-handlebars</module>
-    <module>e2e-reporting</module>
+    <!-- <module>e2e-reporting</module> -->
     <module>bootstraped-multi-test-results-report</module>
   </modules>
   <dependencies>