diff --git a/CHANGES b/CHANGES
index b293f12b6..c6e445506 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,6 +29,8 @@ Bugs fixed
 * #4574: vertical space before equation in latex
 * #4720: message when an image is mismatched for builder is not clear
 * #4655, #4684: Incomplete localization strings in Polish and Chinese
+* #2286: Sphinx crashes when error is happens in rendering HTML pages
+* #4688: Error to download remote images having long URL
 * #4754: sphinx/pycode/__init__.py raises AttributeError
 
 Testing
diff --git a/doc/markup/code.rst b/doc/markup/code.rst
index 3b14bd6e2..19ec0cc4c 100644
--- a/doc/markup/code.rst
+++ b/doc/markup/code.rst
@@ -96,7 +96,7 @@ switch on line numbers for the individual block::
       Some more Ruby code.
 
 The first line number can be selected with the ``lineno-start`` option.  If
-present, ``linenos`` is automatically activated as well::
+present, ``linenos`` flag is automatically activated::
 
    .. code-block:: ruby
       :lineno-start: 10
diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py
index 183ffc017..fad49486b 100644
--- a/sphinx/builders/html.py
+++ b/sphinx/builders/html.py
@@ -35,8 +35,9 @@ from sphinx.deprecation import RemovedInSphinx20Warning
 from sphinx.environment.adapters.asset import ImageAdapter
 from sphinx.environment.adapters.indexentries import IndexEntries
 from sphinx.environment.adapters.toctree import TocTree
+from sphinx.errors import ThemeError
 from sphinx.highlighting import PygmentsBridge
-from sphinx.locale import _, l_
+from sphinx.locale import _, __, l_
 from sphinx.search import js_index
 from sphinx.theming import HTMLThemeFactory
 from sphinx.util import jsonimpl, logging, status_iterator
@@ -1016,6 +1017,9 @@ class StandaloneHTMLBuilder(Builder):
                            "Please make sure all config values that contain "
                            "non-ASCII content are Unicode strings.", pagename)
             return
+        except Exception as exc:
+            raise ThemeError(__("An error happened in rendering the page %s.\nReason: %r") %
+                             (pagename, exc))
 
         if not outfilename:
             outfilename = self.get_outfilename(pagename)
diff --git a/sphinx/transforms/post_transforms/images.py b/sphinx/transforms/post_transforms/images.py
index b8f4b9a5d..6dd135e1e 100644
--- a/sphinx/transforms/post_transforms/images.py
+++ b/sphinx/transforms/post_transforms/images.py
@@ -30,6 +30,8 @@ if False:
 
 logger = logging.getLogger(__name__)
 
+MAX_FILENAME_LEN = 32
+
 
 class BaseImageConverter(SphinxTransform):
     def apply(self):
@@ -66,16 +68,21 @@ class ImageDownloader(BaseImageConverter):
 
     def handle(self, node):
         # type: (nodes.Node) -> None
-        basename = os.path.basename(node['uri'])
-        if '?' in basename:
-            basename = basename.split('?')[0]
-        if basename == '':
-            basename = sha1(node['uri'].encode("utf-8")).hexdigest()
-        dirname = node['uri'].replace('://', '/').translate({ord("?"): u"/",
-                                                             ord("&"): u"/"})
-        ensuredir(os.path.join(self.imagedir, dirname))
-        path = os.path.join(self.imagedir, dirname, basename)
         try:
+            basename = os.path.basename(node['uri'])
+            if '?' in basename:
+                basename = basename.split('?')[0]
+            if basename == '' or len(basename) > MAX_FILENAME_LEN:
+                filename, ext = os.path.splitext(node['uri'])
+                basename = sha1(filename.encode("utf-8")).hexdigest() + ext
+
+            dirname = node['uri'].replace('://', '/').translate({ord("?"): u"/",
+                                                                 ord("&"): u"/"})
+            if len(dirname) > MAX_FILENAME_LEN:
+                dirname = sha1(dirname.encode('utf-8')).hexdigest()
+            ensuredir(os.path.join(self.imagedir, dirname))
+            path = os.path.join(self.imagedir, dirname, basename)
+
             headers = {}
             if os.path.exists(path):
                 timestamp = ceil(os.stat(path).st_mtime)