Master maven

src/main/java/com/cronos/onlinereview/model/PhaseGroup.java

@@ -1376,6 +1376,9 @@ public Submission getIterativeReviewSubmission() {
      * @param iterativeReviewSubmission a <code>Submission</code> providing the details on iterative review submission.
      */
     public void setIterativeReviewSubmission(Submission iterativeReviewSubmission) {
+        if (iterativeReviewSubmission == null) {
+            return;
+        }
         this.iterativeReviewSubmission = iterativeReviewSubmission;
         Upload upload = iterativeReviewSubmission.getUpload();
         this.iterativeReadyToDownload = upload == null || upload.getUrl() == null || !ActionsHelper.isDmzBucket(upload.getUrl());

src/main/java/com/cronos/onlinereview/util/PhasesDetailsServices.java

@@ -1139,22 +1139,24 @@ private static void serviceIterativeReviewsAppFunc(HttpServletRequest request, P
                     throw new BaseException("Unable to find the Submitter resource "
                             + "associated with the current user for project " + project.getId());
                 }
-
-                Submission[] mySubmissions = ActionsHelper.getResourceSubmissions(myResource.getId(),
-                        Constants.CONTEST_SUBMISSION_TYPE_NAME, null, false);
-                if (mySubmissions != null) {
-                    for (Submission submission : mySubmissions) {
-                        if (submission.getId() == associatedSubmission.getId()) {
-                            phaseGroup.setIterativeReviewSubmission(associatedSubmission);
+                if (associatedSubmission != null) {
+                    Submission[] mySubmissions = ActionsHelper.getResourceSubmissions(myResource.getId(),
+                            Constants.CONTEST_SUBMISSION_TYPE_NAME, null, false);
+                    if (mySubmissions != null) {
+                        for (Submission submission : mySubmissions) {
+                            if (submission.getId() == associatedSubmission.getId()) {
+                                phaseGroup.setIterativeReviewSubmission(associatedSubmission);
+                            }
                         }
                     }
                 }
             }
-
-            for (Resource resource : allProjectResources) {
-                if (resource.getId() == associatedSubmission.getUpload().getOwner()) {
-                    phaseGroup.setIterativeReviewSubmitter(resource);
-                    break;
+            if (associatedSubmission != null) {
+                for (Resource resource : allProjectResources) {
+                    if (resource.getId() == associatedSubmission.getUpload().getOwner()) {
+                        phaseGroup.setIterativeReviewSubmitter(resource);
+                        break;
+                    }
                 }
             }