diff --git a/bin/bitbake-setup b/bin/bitbake-setup
index 427a2d835..d18d32ba0 100755
--- a/bin/bitbake-setup
+++ b/bin/bitbake-setup
@@ -985,6 +985,10 @@ def do_fetch(fetcher, dir):
         try:
             fetcher.download()
             fetcher.unpack_update(dir)
+        except:
+            if os.path.exists(fetchlog) and os.path.getsize(fetchlog) > 0:
+                logger.error("Check {} for additional information that may help diagnoze the issue.".format(fetchlog))
+            raise
         finally:
             sys.stdout = oldstdout