From 7bba9f73d0ed37a342e3f0519969110c03f142d3 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Wed, 20 Jul 2016 13:46:10 -0700
Subject: [PATCH] [bugfix] fix dual alert messages where the second one is
 empty

---
 caravel/assets/javascripts/modules/caravel.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/caravel/assets/javascripts/modules/caravel.js b/caravel/assets/javascripts/modules/caravel.js
index c244032b1c..e5057cd0fb 100644
--- a/caravel/assets/javascripts/modules/caravel.js
+++ b/caravel/assets/javascripts/modules/caravel.js
@@ -316,7 +316,10 @@ var px = (function () {
         token.find("img.loading").hide();
         var err = msg ? ('<div class="alert alert-danger">' + msg + '</div>') : "";
         if (xhr) {
-          err += '<div class="alert alert-danger">' + this.getErrorMsg(xhr) + '</div>';
+          var extendedMsg = this.getErrorMsg(xhr);
+          if (extendedMsg) {
+            err += '<div class="alert alert-danger">' + extendedMsg + '</div>';
+          }
         }
         container.html(err);
         container.show();