diff --git a/bin/make_dawn_views b/bin/make_dawn_views
index 671527b5697b37cd080cd806b3d06d22d7bb11bb..e80cd8fa1af5e209a20e52d8a33bcef20e389f2b 100755
--- a/bin/make_dawn_views
+++ b/bin/make_dawn_views
@@ -5,6 +5,7 @@
 # C. Peng (ANL), translate to python and add flexible run time for simulation
 
 import os
+import sys
 import signal
 import subprocess
 import argparse
@@ -84,6 +85,9 @@ dawn_env['DAWN_BATCH'] = 'a'
 # generate DAWN images
 out_dir = os.path.abspath(args.out_dir)
 input_file = os.path.abspath(args.input)
+if (not os.path.exists(input_file)):
+    print('Input file does not exist!')
+    sys.exit(-1)
 #prim_file = '{}/{}.prim'.format(input_dir,args.file_tag)
 #prim_file = os.path.abspath(prim_file)
 owd = os.getcwd()
diff --git a/views/generate_prim_files.yml b/views/generate_prim_files.yml
index 69c25d3fe7290a2ef778eecc5431bba0707d1a68..357592bb9d5096585f7c0482eeef366d46c3e038 100644
--- a/views/generate_prim_files.yml
+++ b/views/generate_prim_files.yml
@@ -2,8 +2,10 @@ view_prim:detector_only:
   extends: .views
   stage: test
   script:
+    - ls -lrth && ls -lrth ${LOCAL_DATA_PATH}
     - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -D -t detector_view
     - ls -lrth && ls -lrth ${LOCAL_DATA_PATH}
+    - test -f ${LOCAL_DATA_PATH}/detector_view.prim
 
 view_prim:ev001:
   extends: .views
@@ -12,6 +14,8 @@ view_prim:ev001:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
     - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev001 -s 1
+    - ls -lrth && ls -lrth ${LOCAL_DATA_PATH}
+    - test -f ${LOCAL_DATA_PATH}/view_ev001.prim
 
 view_prim:ev002:
   extends: .views
@@ -20,6 +24,8 @@ view_prim:ev002:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
     - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev002 -s 2
+    - ls -lrth && ls -lrth ${LOCAL_DATA_PATH}
+    - test -f ${LOCAL_DATA_PATH}/view_ev002.prim
 
 view_prim:ev003:
   extends: .views
@@ -28,6 +34,8 @@ view_prim:ev003:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
     - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev003 -s 3
+    - ls -lrth && ls -lrth ${LOCAL_DATA_PATH}
+    - test -f ${LOCAL_DATA_PATH}/view_ev003.prim
 
 view_prim:ev004:
   extends: .views
@@ -36,15 +44,20 @@ view_prim:ev004:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
     - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev004 -s 4
-
+    - ls -lrth && ls -lrth ${LOCAL_DATA_PATH}
+    - test -f ${LOCAL_DATA_PATH}/view_ev004.prim
 
 view_prim:calorimeters:
   extends: .views
   stage: test
+  needs:
+    - job: view_prim:detector_only
   script:
+    - ls -lrth && ls -lrth ${LOCAL_DATA_PATH}
     - cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/."
     - ./bin/generate_prim_file -c ${DETECTOR_PATH}/calorimeters.xml -o ${LOCAL_DATA_PATH} -D -t calorimeters_view
     - ls -lrth && ls -lrth ${LOCAL_DATA_PATH}
+    - test -f ${LOCAL_DATA_PATH}/calorimeters_view.prim
 
 view_prim:calorimeters_ev001:
   extends: .views
@@ -54,6 +67,8 @@ view_prim:calorimeters_ev001:
   script:
     - cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/."
     - ./bin/generate_prim_file -c ${DETECTOR_PATH}/calorimeters.xml -o ${LOCAL_DATA_PATH} -t calorimeters_view_ev001 -s 1
+    - ls -lrth && ls -lrth ${LOCAL_DATA_PATH}
+    - test -f ${LOCAL_DATA_PATH}/calorimeters_view_ev0001.prim
 
 view_prim:calorimeters_ev002:
   extends: .views
@@ -63,4 +78,5 @@ view_prim:calorimeters_ev002:
   script:
     - cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/."
     - ./bin/generate_prim_file -c ${DETECTOR_PATH}/calorimeters.xml -o ${LOCAL_DATA_PATH} -t calorimeters_view_ev002 -s 2
-
+    - ls -lrth && ls -lrth ${LOCAL_DATA_PATH}
+    - test -f ${LOCAL_DATA_PATH}/calorimeters_view_ev0002.prim
diff --git a/views/view1.yml b/views/view1.yml
index 4d85b5c709808b9c0a4047af0423997375a71a58..ea6f194e51ed8269775513fcd97b7f0089282b25 100644
--- a/views/view1.yml
+++ b/views/view1.yml
@@ -4,8 +4,10 @@ dawn_view_01:detector:
     - job: view_prim:detector_only
       optional: false
   script:
+    - ls -lrth && ls -lrth ${LOCAL_DATA_PATH}
     - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view01 -d scripts/view1 -D
 
+
 dawn_view_01:ev001:
   extends: .views
   rules: