diff --git a/.travis.yml b/.travis.yml
index 2efd182b7..e4d217379 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,11 +16,15 @@ matrix:
           python: 3.7
           before_install:
             - choco install python3 --version=3.7.4
+            - choco install openssl --version=1.1.1.900 
             - pip install ntc_templates==1.4.1
             - pip install textfsm==0.4.1
           env:
             - PATH=/c/Python37:/c/Python37/Scripts:$PATH
             - TRAVIS_PYTHON_VERSION=3.7
+            - CRYPTOGRAPHY_DONT_BUILD_RUST=1
+            - INCLUDE='C:\OpenSSL-Win32\include'
+            - LIB='C:\OpenSSL-Win32\lib'
 addons:
   apt:
     packages:
@@ -29,6 +33,7 @@ addons:
     - libxslt1-dev
 
 install:
+  - "set"
   - "pip install -r development.txt"
   - "pip install -r requirements.txt"
   - "pip install ."
diff --git a/lib/jnpr/junos/utils/config.py b/lib/jnpr/junos/utils/config.py
index 32b99b6ad..8c0b8007d 100644
--- a/lib/jnpr/junos/utils/config.py
+++ b/lib/jnpr/junos/utils/config.py
@@ -260,6 +260,10 @@ def diff(self, rb_id=0, ignore_warning=False, use_fast_diff=False):
             else:
                 raise
 
+        # Check return type is an etree Element, if not return None for no changes
+        if not type(rsp) == etree._Element:
+            return None
+
         diff_txt = rsp.find("configuration-output").text
         return None if diff_txt == "\n" else diff_txt