diff --git a/Tautulli.py b/Tautulli.py
index ead27c31..eebfa55a 100755
--- a/Tautulli.py
+++ b/Tautulli.py
@@ -253,16 +253,6 @@ def main():
     else:
         plexpy.HTTP_PORT = int(plexpy.CONFIG.HTTP_PORT)
 
-    # Check if pyOpenSSL is installed. It is required for certificate generation
-    # and for CherryPy.
-    if plexpy.CONFIG.ENABLE_HTTPS:
-        try:
-            import OpenSSL
-        except ImportError:
-            logger.warn("The pyOpenSSL module is missing. Install this "
-                        "module to enable HTTPS. HTTPS will be disabled.")
-            plexpy.CONFIG.ENABLE_HTTPS = False
-
     # Try to start the server. Will exit here is address is already in use.
     webstart.start()
 
diff --git a/plexpy/helpers.py b/plexpy/helpers.py
index da5a5df5..b0995849 100644
--- a/plexpy/helpers.py
+++ b/plexpy/helpers.py
@@ -486,7 +486,7 @@ def create_https_certificates(ssl_cert, ssl_key):
     try:
         from OpenSSL import crypto
     except ImportError:
-        logger.error("Unable to generate self-signed certificates: Missing OpenSSL module.")
+        logger.error("Unable to generate self-signed certificates: Missing pyOpenSSL module.")
         return False
     from certgen import createKeyPair, createSelfSignedCertificate, TYPE_RSA