diff --git a/bin/build_detector.sh b/bin/build_detector.sh
index 20b863002d839084df3ec42eb2920208d672684b..dae08e38cc46c3ea35a80915b279ffa5baa4461f 100755
--- a/bin/build_detector.sh
+++ b/bin/build_detector.sh
@@ -35,7 +35,7 @@ if [ -d "${JUGGLER_DETECTOR}" ]; then
 fi
 echo "Fetching ${JUGGLER_DETECTOR}"
 git clone -b ${JUGGLER_DETECTOR_VERSION} --depth 1 https://eicweb.phy.anl.gov/EIC/detectors/${JUGGLER_DETECTOR}.git
-[[ -n "$?" ]]  ||  exit 1
+[[ ! "$?" == "0" ]]  ||  exit 1
 rm -rf "${JUGGLER_DETECTOR}/.git"
 
 ## We need an up-to-date copy of the detector
@@ -47,7 +47,7 @@ fi
 echo "Fetching ${BEAMLINE_CONFIG}"
 echo "git clone -b ${BEAMLINE_CONFIG_VERSION} --depth 1 https://eicweb.phy.anl.gov/EIC/detectors/${BEAMLINE_CONFIG}.git"
 git clone -b ${BEAMLINE_CONFIG_VERSION} --depth 1 https://eicweb.phy.anl.gov/EIC/detectors/${BEAMLINE_CONFIG}.git
-[[ -n "$?" ]]  ||  exit 1
+[[ ! "$?" == "0" ]]  ||  exit 1
 rm -rf "${BEAMLINE_CONFIG}/.git"
 
 ## We also need an up-to-date copy of the accelerator. For now this is done
@@ -58,15 +58,15 @@ if [ -d accelerator ]; then
 fi
 echo "Fetching accelerator"
 git clone --depth 1 https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git
-[[ -n "$?" ]]  ||  exit 1
+[[ ! "$?" == "0" ]]  ||  exit 1
 rm -rf "accelerator/.git"
 
 ## Now symlink the accelerator definition into the detector definition
 echo "Linking accelerator definition into detector definition"
 ln -s -f ${DETECTOR_PREFIX}/accelerator/eic ${DETECTOR_PATH}/eic
-[[ -n "$?" ]]  ||  exit 1
+[[ ! "$?" == "0" ]]  ||  exit 1
 ln -s -f ${DETECTOR_PREFIX}/${BEAMLINE_CONFIG}/${BEAMLINE_CONFIG} ${DETECTOR_PATH}/${BEAMLINE_CONFIG}
-[[ -n "$?" ]]  ||  exit 1
+[[ ! "$?" == "0" ]]  ||  exit 1
 
 popd
 ## =============================================================================