diff --git a/plexpy/versioncheck.py b/plexpy/versioncheck.py
index ff7f0efa..7a38e008 100644
--- a/plexpy/versioncheck.py
+++ b/plexpy/versioncheck.py
@@ -178,6 +178,10 @@ def checkGithub(auto_update=False):
         url = 'https://api.github.com/repos/%s/plexpy/releases' % plexpy.CONFIG.GIT_USER
         releases = request.request_json(url, timeout=20, whitelist_status_code=404, validator=lambda x: type(x) == list)
 
+        if releases is None:
+            logger.warn('Could not get releases from GitHub.')
+            return plexpy.LATEST_VERSION
+
         if plexpy.CONFIG.GIT_BRANCH == 'master':
             release = next((r for r in releases if not r['prerelease']), releases[0])
         elif plexpy.CONFIG.GIT_BRANCH == 'beta':