diff --git a/contrib/gana b/contrib/gana
index bb814747c..fc7a860e2 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit bb814747c82941a3cea6ec2d4c6961902995df17
+Subproject commit fc7a860e2e3f8ae1d73c1c5d9c91964ac8c8a3ec
diff --git a/src/exchange/taler-exchange-httpd_deposit.c b/src/exchange/taler-exchange-httpd_deposit.c
index 7cd78119a..acdc6ee6d 100644
--- a/src/exchange/taler-exchange-httpd_deposit.c
+++ b/src/exchange/taler-exchange-httpd_deposit.c
@@ -307,6 +307,15 @@ TEH_handler_deposit (struct MHD_Connection *connection,
                                        TALER_EC_EXCHANGE_DEPOSIT_REFUND_DEADLINE_AFTER_WIRE_DEADLINE,
                                        NULL);
   }
+  if (GNUNET_TIME_absolute_is_never (deposit.wire_deadline.abs_time))
+  {
+    GNUNET_break_op (0);
+    GNUNET_JSON_parse_free (spec);
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_EXCHANGE_DEPOSIT_WIRE_DEADLINE_IS_NEVER,
+                                       NULL);
+  }
   deposit.receiver_wire_account = (char *) payto_uri;
   TALER_payto_hash (payto_uri,
                     &dc.h_payto);