diff --git a/library/src/org/onepf/oms/appstore/googleUtils/IabHelper.java b/library/src/org/onepf/oms/appstore/googleUtils/IabHelper.java
index df1b142f..059ddefd 100644
--- a/library/src/org/onepf/oms/appstore/googleUtils/IabHelper.java
+++ b/library/src/org/onepf/oms/appstore/googleUtils/IabHelper.java
@@ -140,6 +140,7 @@ public class IabHelper implements AppstoreInAppBillingService {
     public static final int IABHELPER_UNKNOWN_ERROR = -1008;
     public static final int IABHELPER_SUBSCRIPTIONS_NOT_AVAILABLE = -1009;
     public static final int IABHELPER_INVALID_CONSUMPTION = -1010;
+    public static final int IABHELPER_SERVICE_ERROR = -1011;
 
     // Keys for the responses from InAppBillingService
     public static final String RESPONSE_CODE = "RESPONSE_CODE";
@@ -209,10 +210,19 @@ public void startSetup(final OnIabSetupFinishedListener listener) {
         // Connection to IAB service
         logDebug("Starting in-app billing setup.");
         mServiceConn = new ServiceConnection() {
+
+            private boolean mFirstConnection = true;
+
             @Override
             public void onServiceDisconnected(ComponentName name) {
                 logDebug("Billing service disconnected.");
                 mService = null;
+                try {
+                    // Try to automatically reconnect to service
+                    mContext.bindService(getServiceIntent(), this, Context.BIND_AUTO_CREATE);
+                } catch (Exception e) {
+                    // Ignore errors
+                }
             }
 
             @Override
@@ -227,8 +237,9 @@ public void onServiceConnected(ComponentName name, IBinder service) {
                     // check for in-app billing v3 support
                     int response = mService.isBillingSupported(3, packageName, ITEM_TYPE_INAPP);
                     if (response != BILLING_RESPONSE_RESULT_OK) {
-                        if (listener != null) listener.onIabSetupFinished(new IabResult(response,
-                                "Error checking for billing v3 support."));
+                        if (listener != null && mFirstConnection) {
+                            listener.onIabSetupFinished(new IabResult(response, "Error checking for billing v3 support."));
+                        }
 
                         // if in-app purchases aren't supported, neither are subscriptions.
                         mSubscriptionsSupported = false;
@@ -248,7 +259,7 @@ public void onServiceConnected(ComponentName name, IBinder service) {
 
                     mSetupDone = true;
                 } catch (RemoteException e) {
-                    if (listener != null) {
+                    if (listener != null && mFirstConnection) {
                         listener.onIabSetupFinished(new IabResult(IABHELPER_REMOTE_EXCEPTION,
                                                     "RemoteException while setting up in-app billing."));
                     }
@@ -256,9 +267,10 @@ public void onServiceConnected(ComponentName name, IBinder service) {
                     return;
                 }
 
-                if (listener != null) {
+                if (listener != null && mFirstConnection) {
                     listener.onIabSetupFinished(new IabResult(BILLING_RESPONSE_RESULT_OK, "Setup successful."));
                 }
+                mFirstConnection = false;
             }
         };
 
@@ -398,7 +410,7 @@ public void launchPurchaseFlow(Activity act, String sku, String itemType, int re
             logDebug("Constructing buy intent for " + sku + ", item type: " + itemType);
             if (mService == null) {
                 logError("Unable to buy item, Error response: service is not connected.");
-                result = new IabResult(BILLING_RESPONSE_RESULT_ERROR, "Unable to buy item");
+                result = new IabResult(IABHELPER_SERVICE_ERROR, "Service error");
                 if (listener != null) listener.onIabPurchaseFinished(result, null);
                 flagEndAsync();
                 return;
@@ -693,7 +705,7 @@ public void consume(Purchase itemInfo) throws IabException {
             logDebug("Consuming sku: " + sku + ", token: " + token);
             if (mService == null) {
                 logDebug("Error consuming consuming sku " + sku + ". Service is not connected.");
-                throw new IabException(BILLING_RESPONSE_RESULT_ERROR, "Error consuming sku " + sku);
+                throw new IabException(IABHELPER_SERVICE_ERROR, "Service error consuming sku " + sku);
             }
             int response = mService.consumePurchase(3, getPackageName(), token);
             if (response == BILLING_RESPONSE_RESULT_OK) {
@@ -882,7 +894,7 @@ int queryPurchases(Inventory inv, String itemType) throws JSONException, RemoteE
             logDebug("Calling getPurchases with continuation token: " + continueToken);
             if(mService==null){
                 logDebug("getPurchases() failed: service is not connected.");
-                return BILLING_RESPONSE_RESULT_ERROR;
+                return IABHELPER_SERVICE_ERROR;
             }
             Bundle ownedItems = mService.getPurchases(3, getPackageName(), itemType, continueToken);
 
@@ -977,7 +989,7 @@ int querySkuDetails(String itemType, Inventory inv, List<String> moreSkus) throw
             querySkus.putStringArrayList(GET_SKU_DETAILS_ITEM_LIST, batch);
             if (mService == null) {
                 logError("unable to get sku details: service is not connected.");
-                return IABHELPER_BAD_RESPONSE;
+                return IABHELPER_SERVICE_ERROR;
             }
             Bundle skuDetails = mService.getSkuDetails(3, mContext.getPackageName(), itemType, querySkus);