diff --git a/.travis.yml b/.travis.yml
index 9fab56188b..a1568c9118 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,23 +47,27 @@ matrix:
     script: bench --site test_site run-ui-tests frappe --headless
 
 before_install:
-    # do we really want to run travis?
+ # do we really want to run travis? check which files are changed and if git doesnt face any fatal errors
   - |
-    ONLY_DOCS_CHANGES=$(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '\.(md|png|jpg|jpeg)$|^.github|LICENSE' ; echo $?)
-    ONLY_JS_CHANGES=$(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '\.js$' ; echo $?)
-    ONLY_PY_CHANGES=$(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '\.py$' ; echo $?)
+    FILES_CHANGED=$( git diff --name-only $TRAVIS_COMMIT_RANGE 2>&1 )
 
-    if [[ $ONLY_DOCS_CHANGES == "1" ]]; then
-        echo "Only docs were updated, stopping build process.";
-        exit;
-    fi
-    if [[ $ONLY_JS_CHANGES == "1"  && $TYPE == "server" ]]; then
-        echo "Only JavaScript code was updated; Stopping Python build process.";
-        exit;
-    fi
-    if [[ $ONLY_PY_CHANGES == "1"  && $TYPE == "ui" ]]; then
-        echo "Only Python code was updated, stopping Cypress build process.";
-        exit;
+    if [[ $FILES_CHANGED != *"fatal"* ]]; then
+      ONLY_DOCS_CHANGES=$( echo $FILES_CHANGED | grep -qvE '\.(md|png|jpg|jpeg)$|^.github|LICENSE' ; echo $? )
+      ONLY_JS_CHANGES=$( echo $FILES_CHANGED | grep -qvE '\.js$' ; echo $? )
+      ONLY_PY_CHANGES=$( echo $FILES_CHANGED | grep -qvE '\.py$' ; echo $? )
+
+      if [[ $ONLY_DOCS_CHANGES == "1" ]]; then
+          echo "Only docs were updated, stopping build process.";
+          exit;
+      fi
+      if [[ $ONLY_JS_CHANGES == "1"  && $TYPE == "server" ]]; then
+          echo "Only JavaScript code was updated; Stopping Python build process.";
+          exit;
+      fi
+      if [[ $ONLY_PY_CHANGES == "1"  && $TYPE == "ui" ]]; then
+          echo "Only Python code was updated, stopping Cypress build process.";
+          exit;
+      fi
     fi
 
  # install wkhtmltopdf