diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt
index d2f7c9b63..5a58bf9c4 100644
--- a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt
+++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt
@@ -20,6 +20,7 @@ import net.gini.android.merchant.sdk.integratedFlow.PaymentFlowConfiguration
 import net.gini.android.merchant.sdk.integratedFlow.PaymentFragment
 import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent
 import net.gini.android.merchant.sdk.util.DisplayedScreen
+import net.gini.android.merchant.sdk.util.toBackendFormat
 import org.slf4j.LoggerFactory
 
 /**
@@ -108,7 +109,15 @@ class GiniMerchant(
      * @param flowConfiguration - optional parameter with the [PaymentFlowConfiguration]
      */
     fun createFragment(iban: String, recipient: String, amount: String, purpose: String, flowConfiguration: PaymentFlowConfiguration? = null): PaymentFragment {
-        if (iban.isEmpty() || recipient.isEmpty() || amount.isEmpty() || purpose.isEmpty()) throw IllegalStateException("Payment details are incomplete.")
+        if (iban.isEmpty() || recipient.isEmpty() || amount.isEmpty() || purpose.isEmpty()) {
+            error("Payment details are incomplete.")
+        }
+
+        try {
+            amount.toBackendFormat()
+        } catch (e: NumberFormatException) {
+            error("Amount format is incorrect.")
+        }
 
         val paymentDetails = PaymentDetails(
             recipient = recipient,
diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_payment_provider_selector_button.xml b/merchant-sdk/sdk/src/main/res/layout/gms_payment_provider_selector_button.xml
index 7056ae5b4..e2f53b631 100644
--- a/merchant-sdk/sdk/src/main/res/layout/gms_payment_provider_selector_button.xml
+++ b/merchant-sdk/sdk/src/main/res/layout/gms_payment_provider_selector_button.xml
@@ -23,6 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/gms_large"
+        android:visibility="gone"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent"