diff --git a/obexd/src/ftp.c b/obexd/src/ftp.c
index 969c288..3fb2528 100644
--- a/obexd/src/ftp.c
+++ b/obexd/src/ftp.c
@@ -179,7 +179,8 @@ static gboolean get_capability(struct obex_session *os, guint32 *size)
 	gint exit;
 	gboolean ret;
 
-	debug("%s - cap: %s", __func__, os->server->capability);
+	if (os->server->capability == NULL)
+		return FALSE;
 
 	if (os->server->capability[0] != '!') {
 		return os_prepare_get(os, os->server->capability, size);
diff --git a/obexd/src/main.c b/obexd/src/main.c
index 17bf2f6..0f16402 100644
--- a/obexd/src/main.c
+++ b/obexd/src/main.c
@@ -150,6 +150,7 @@ int main(int argc, char *argv[])
 			break;
 		case 'c':
 			capability = optarg;
+			break;
 		case 'a':
 			auto_accept = 1;
 			break;
@@ -200,7 +201,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (opush)
-		server_start(OBEX_OPUSH, root_path, auto_accept, capability);
+		server_start(OBEX_OPUSH, root_path, auto_accept, NULL);
 
 	if (ftp)
 		server_start(OBEX_FTP, root_path, auto_accept, capability);