diff --git a/.github/scripts/notarize-osx-distro-file.sh b/.github/scripts/notarize-osx-distro-file.sh
index 3a6eda897..95245d5b3 100755
--- a/.github/scripts/notarize-osx-distro-file.sh
+++ b/.github/scripts/notarize-osx-distro-file.sh
@@ -14,6 +14,6 @@ if [ $? -eq 0 ]; then
   shasum -a 256 $dmg_filename > ${dmg_filename}.sha256
   md5 $dmg_filename > ${dmg_filename}.md5
 else
-  echo "Notarization failed"
+  echo "Notarization failed for ${dmg_file}"
   exit 1
 fi
diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
index 41461b1d7..566049da4 100644
--- a/.github/workflows/gh-hosted-eclipse-distro-build.yml
+++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -266,8 +266,17 @@ jobs:
           do
             ${{ github.workspace }}/.github/scripts/notarize-osx-distro-file.sh $dmg_file $NOTARIZE_PROFILE &
           done
-          wait
-          echo "Done signing and notarization of DMG files"
+          for job in `jobs -p`
+          do
+            wait $job || let "FAIL+=1"
+          done
+          if [ "$FAIL" == "0" ];
+          then
+            echo "Done signing and notarization of DMG files"
+          else
+            echo "Failed Notarization"
+            exit 1
+          fi
       - name: Update DMG files on S3
         id: update-s3
         run: |