diff --git a/src/scripts/condor_submit.sh b/src/scripts/condor_submit.sh
index 334c85fe..c96595bf 100755
--- a/src/scripts/condor_submit.sh
+++ b/src/scripts/condor_submit.sh
@@ -183,7 +183,7 @@ if [ ${#remap_files[@]} -gt 0 ] ; then
 	if [ ! -z "${remap_files[0]}" ] ; then
 	    map=${remap_files[$i]}
 	else
-	    map=${output_files$i]}
+	    map=${output_files[$i]}
 	fi
 	transfer_output_remaps="$transfer_output_remaps;${output_files[$i]}=$map"
     done
diff --git a/src/scripts/pbs_submit.sh b/src/scripts/pbs_submit.sh
index e3ad4cda..67a536a7 100755
--- a/src/scripts/pbs_submit.sh
+++ b/src/scripts/pbs_submit.sh
@@ -213,6 +213,12 @@ fi
 
 # The job id is actually the first numbers in the string (slurm support)
 jobID=`echo $jobID | awk 'match($0,/[0-9]+/){print substr($0, RSTART, RLENGTH)}'`
+if [ "X$jobID" == "X" ]; then
+	rm -f $bls_tmp_file
+	echo "Error: job id missing" >&2
+	echo Error # for the sake of waiting fgets in blahpd
+	exit 1
+fi
 
 if [ "x$pbs_nologaccess" != "xyes" -a "x$pbs_nochecksubmission" != "xyes" ]; then