diff --git a/cccli/commands.py b/cccli/commands.py
index 56631ad7135002b1d227d0806f402da7763e8bc3..c91217515e1cd49fcc2140a689ed8510eb2c8f53 100644
--- a/cccli/commands.py
+++ b/cccli/commands.py
@@ -31,6 +31,8 @@ class Commands(object):
             cobj = self.cmds[cname](self.cli, cname)
             if isinstance(cobj, command.RemoteCommand):
                 try:
+                    if len(cobj.remote_functions()) == 0:
+                        raise NotImplementedError("No remote function")
                     if not cobj.remote_functions().issubset(self.functions):
                         del self.cmds[cname]
                         self.cli.printer.debug("Command %s not available"%cname)