diff --git a/Dockerfile b/Dockerfile
index d13c2389..42e12eea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,10 +15,11 @@ RUN apt-get update && apt-get install -y gnupg \
 #=========
 # Chrome driver
 #=========
-RUN CHROMEVER=$(google-chrome --product-version | grep -o "[^\.]*\.[^\.]*\.[^\.]*") && \
-DRIVERVER=$(curl -s "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROMEVER") && \
-wget -q --continue -P /chromedriver "http://chromedriver.storage.googleapis.com/$DRIVERVER/chromedriver_linux64.zip" && \
-unzip /chromedriver/chromedriver* -d /chromedriver
+RUN CHROMEVER=$(google-chrome --product-version | grep -o "[^\\.]*\\.[^\\.]*\\.[^\\.]*") \
+    && DRIVERVER=$(curl -s "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROMEVER") \
+    && if [ -z "$DRIVERVER" ]; then echo "Failed to get ChromeDriver version"; exit 1; fi \
+    && wget -q --continue -P /chromedriver "http://chromedriver.storage.googleapis.com/$DRIVERVER/chromedriver_linux64.zip" \
+    && unzip /chromedriver/chromedriver* -d /chromedriver
 #=========
 # Firefox
 #=========