diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index e6d65767aec310f90a110728e14cb00f398e78d9..e31fb338e79129aba47faffb41afef482f05601d 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -3855,13 +3855,13 @@ public class ConversationFragment extends XmppFragment
                         case R.id.add_contact:
                             mAddBackClickListener.onClick(view);
                             return true;
-                        case R.id.block_domain:
-                            blockable =
-                                    conversation
-                                            .getAccount()
-                                            .getRoster()
-                                            .getContact(jid.getDomain());
-                            break;
+                        // case R.id.block_domain:
+                        //     blockable =
+                        //             conversation
+                        //                     .getAccount()
+                        //                     .getRoster()
+                        //                     .getContact(jid.getDomain());
+                        //     break;
                         default:
                             blockable = conversation;
                     }
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index a193809bc9407d2d9c28bc6ea2fb88715176f273..4b708ebcb5db6e019bada5631fedbba8ce906ea9 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -4,6 +4,7 @@ import android.telephony.TelephonyManager;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
+import android.app.Application;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;
@@ -164,6 +165,12 @@ public abstract class XmppActivity extends ActionBarActivity {
 
                 @Override
                 public void onServiceConnected(ComponentName className, IBinder service) {
+                    if (!(service instanceof XmppConnectionBinder)) {
+                        throw new ClassCastException("Expected XmppConnectionBinder but got "
+                                + service.getClass().getName()
+                                + " from component: " + className
+                                + " in process: " + Application.getProcessName());
+                    }
                     XmppConnectionBinder binder = (XmppConnectionBinder) service;
                     xmppConnectionService = binder.getService();
                     xmppConnectionServiceBound = true;
diff --git a/src/main/res/menu/block.xml b/src/main/res/menu/block.xml
index 8dac13c22b3b47de044796c5b67c2c57ca9673f2..b59709edde00f5d76ad0f50bd3efda49f040d1f1 100644
--- a/src/main/res/menu/block.xml
+++ b/src/main/res/menu/block.xml
@@ -3,9 +3,6 @@
     <item
         android:id="@+id/reject"
         android:title="@string/reject_request"/>
-    <item
-        android:id="@+id/block_domain"
-        android:title="@string/block_entire_domain" />
     <item
         android:id="@+id/block_contact"
         android:title="@string/block_stranger" />