diff --git a/debian/changelog b/debian/changelog
index 25df9002..0e1fe931 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
       Closes: #809698. Also use --ca-directory /etc/ssl/ca-debian/ with wget
       to ensure this works.
     + Fix size calculation for EFI image
+    + Make tools/update_popcon exit with errors when it fails
 
  -- Steve McIntyre <93sam@debian.org>  Mon, 20 Apr 2015 12:36:57 +0100
 
diff --git a/tools/update_popcon b/tools/update_popcon
index 6d2b67ce..988c92c0 100755
--- a/tools/update_popcon
+++ b/tools/update_popcon
@@ -63,7 +63,15 @@ dl_file () {
 }
 
 MAIN_DATE=`dl_file main`
+error=$?
+if [ $error -ne 0 ]; then
+    exit $error
+fi
 CONTRIB_DATE=`dl_file contrib`
+error=$?
+if [ $error -ne 0 ]; then
+    exit $error
+fi
 
 OUT=$1
 rm -f $OUT
@@ -81,3 +89,7 @@ echo "" >> $OUT
 cat $TDIR/main $TDIR/contrib | \
     egrep -v '(^#|Total|-----|kernel-source)' | \
     sort -rn -k3,3 -k7,7 -k4,4 | awk '{print $2}' >> $OUT
+
+if [ $? -ne 0 ]; then
+    exit $?
+fi