diff --git a/scripts/common_startup.sh b/scripts/common_startup.sh
index 28096d7df56..6a33228d332 100755
--- a/scripts/common_startup.sh
+++ b/scripts/common_startup.sh
@@ -96,5 +96,6 @@ fi
 if [ $FETCH_WHEELS -eq 1 ]; then
     pip install -e git+https://github.com/natefoo/pip@linux-wheels#egg=pip &&
     pip install -r requirements.txt --index-url https://wheels.galaxyproject.org/simple/ &&
-    PYTHONPATH=lib python -c "import galaxy.dependencies; print '\n'.join(galaxy.dependencies.optional('$GALAXY_CONFIG_FILE'))" | pip install -r /dev/stdin --index-url https://wheels.galaxyproject.org/simple/ || exit 1
+    GALAXY_CONDITIONAL_DEPENDENCIES=`PYTHONPATH=lib python -c "import galaxy.dependencies; print '\n'.join(galaxy.dependencies.optional('$GALAXY_CONFIG_FILE'))"` &&
+    [ -z "$GALAXY_CONDITIONAL_DEPENDENCIES" ] || echo "$GALAXY_CONDITIONAL_DEPENDENCIES" | pip install -r /dev/stdin --index-url https://wheels.galaxyproject.org/simple/
 fi