diff --git a/headers/private/media/MediaConnection.h b/headers/private/media/MediaConnection.h
index 414d281204..cce9a24c1a 100644
--- a/headers/private/media/MediaConnection.h
+++ b/headers/private/media/MediaConnection.h
@@ -35,9 +35,6 @@ public:
 	media_connection_id				Id() const;
 	const char*						Name() const;
 
-	bool							IsInput() const;
-	bool 							IsOutput() const;
-
 	bool							HasBinding() const;
 	BMediaConnection*				Binding() const;
 
diff --git a/src/kits/media/MediaClient.cpp b/src/kits/media/MediaClient.cpp
index 13454f3b6a..ac764349b0 100755
--- a/src/kits/media/MediaClient.cpp
+++ b/src/kits/media/MediaClient.cpp
@@ -146,10 +146,13 @@ BMediaClient::Connect(BMediaConnection* ourConnection,
 {
 	CALLED();
 
-	if (ourConnection->IsOutput() && theirConnection.IsInput())
-		return _ConnectInput(dynamic_cast<BMediaOutput*>(ourConnection), theirConnection);
-	else if (ourConnection->IsInput() && theirConnection.IsOutput())
-		return _ConnectOutput(dynamic_cast<BMediaInput*>(ourConnection), theirConnection);
+	BMediaOutput* output = dynamic_cast<BMediaOutput*>(ourConnection);
+	if (output != NULL && theirConnection.IsInput())
+		return _ConnectInput(output, theirConnection);
+
+	BMediaInput* input = dynamic_cast<BMediaInput*>(ourConnection);
+	if (input != NULL && theirConnection.IsOutput())
+		return _ConnectOutput(input, theirConnection);
 
 	return B_ERROR;
 }
diff --git a/src/kits/media/MediaConnection.cpp b/src/kits/media/MediaConnection.cpp
index 6081196c8c..e40277fdad 100644
--- a/src/kits/media/MediaConnection.cpp
+++ b/src/kits/media/MediaConnection.cpp
@@ -36,24 +36,6 @@ BMediaConnection::Connection() const
 }
 
 
-bool
-BMediaConnection::IsOutput() const
-{
-	CALLED();
-
-	return fConnection.IsOutput();
-}
-
-
-bool
-BMediaConnection::IsInput() const
-{
-	CALLED();
-
-	return fConnection.IsInput();
-}
-
-
 bool
 BMediaConnection::HasBinding() const
 {
@@ -162,7 +144,7 @@ BMediaConnection::ConnectionRegistered(BMediaClient* owner,
 	fConnection.id = id;
 	fConnection.client = fOwner->Client();
 
-	if (IsOutput()) {
+	if (fConnection.IsOutput()) {
 		fConnection.source.port = fOwner->fNode->ControlPort();
 		fConnection.source.id = fConnection.id;