diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp
index 8166ce6e6..a4cbbe0a7 100644
--- a/src/qt/bitcoinamountfield.cpp
+++ b/src/qt/bitcoinamountfield.cpp
@@ -49,6 +49,8 @@ void BitcoinAmountField::setText(const QString &text)
 
 QString BitcoinAmountField::text() const
 {
+    if(amount->text().isEmpty() || decimals->text().isEmpty())
+        return QString();
     return amount->text() + QString(".") + decimals->text();
 }
 
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 33d9a2547..d83962d1b 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -48,10 +48,10 @@ void SendCoinsDialog::on_sendButton_clicked()
 
     valid = GUIUtil::parseMoney(payAmount, &payAmountParsed);
 
-    if(!valid)
+    if(!valid || payAmount.isEmpty())
     {
         QMessageBox::warning(this, tr("Send Coins"),
-            tr("The amount to pay must be a valid number."),
+            tr("Must fill in an amount to pay."),
             QMessageBox::Ok, QMessageBox::Ok);
         return;
     }