diff --git a/src/com/mirantis/mk/Galera.groovy b/src/com/mirantis/mk/Galera.groovy
index 96777a7..7627077 100644
--- a/src/com/mirantis/mk/Galera.groovy
+++ b/src/com/mirantis/mk/Galera.groovy
@@ -71,6 +71,7 @@
             testNode = "I@galera:master"
         } catch (Exception e) {
             common.errorMsg('Galera master is not reachable.')
+            common.errorMsg(e.getMessage())
             return 128
         }
     } else {
@@ -79,6 +80,7 @@
             common.infoMsg("Testing Galera slave minions: ${galeraSlaves}")
         } catch (Exception e) {
             common.errorMsg("Cannot obtain Galera slave minions list.")
+            common.errorMsg(e.getMessage())
             return 129
         }
         for (minion in galeraSlaves) {
@@ -103,6 +105,7 @@
         out = salt.runSaltProcessStep(env, "${testNode}", "mysql.status", [], null, false)
     } catch (Exception e) {
         common.errorMsg('Could not determine mysql status.')
+        common.errorMsg(e.getMessage())
         return 256
     }
     if (out) {
@@ -110,6 +113,7 @@
             status = validateAndPrintGaleraStatusReport(env, out, testNode)
         } catch (Exception e) {
             common.errorMsg('Could not parse the mysql status output. Check it manually.')
+            common.errorMsg(e.getMessage())
             return 1
         }
     } else {
@@ -229,8 +233,9 @@
     lastNode = [ip: '', seqno: -2]
     try {
         members = salt.getReturnValues(salt.getPillar(env, "I@galera:master", "galera:master:members"))
-    } catch (Exception er) {
+    } catch (Exception e) {
         common.errorMsg('Could not retrieve members list')
+        common.errorMsg(e.getMessage())
         return 'I@galera:master'
     }
     if (members) {
@@ -248,8 +253,9 @@
                 if (seqno > highestSeqno) {
                     lastNode << [ip: "${member.host}", seqno: seqno]
                 }
-            } catch (Exception er) {
+            } catch (Exception e) {
                 common.warningMsg("Could not determine 'seqno' value for node ${member.host} ")
+                common.warningMsg(e.getMessage())
             }
         }
     }
