diff --git a/headers/private/netservices/UrlRequest.h b/headers/private/netservices/UrlRequest.h
index 993bdfe118..94010edd33 100644
--- a/headers/private/netservices/UrlRequest.h
+++ b/headers/private/netservices/UrlRequest.h
@@ -40,8 +40,6 @@ public:
 
 	// URL protocol thread management
 	virtual	thread_id				Run();
-	virtual status_t				Pause();
-	virtual status_t				Resume();
 	virtual	status_t				Stop();
 	virtual void					SetTimeout(bigtime_t timeout) {}
 
diff --git a/src/kits/network/libnetservices/UrlRequest.cpp b/src/kits/network/libnetservices/UrlRequest.cpp
index fa67851af0..00b6afb6a7 100644
--- a/src/kits/network/libnetservices/UrlRequest.cpp
+++ b/src/kits/network/libnetservices/UrlRequest.cpp
@@ -98,22 +98,6 @@ BUrlRequest::Run()
 }
 
 
-status_t
-BUrlRequest::Pause()
-{
-	// TODO
-	return B_ERROR;
-}
-
-
-status_t
-BUrlRequest::Resume()
-{
-	// TODO
-	return B_ERROR;
-}
-
-
 status_t
 BUrlRequest::Stop()
 {
@@ -146,7 +130,11 @@ BUrlRequest::SetContext(BUrlContext* context)
 	if (IsRunning())
 		return B_ERROR;
 
-	fContext = context;
+	if (context == NULL)
+		fContext = gDefaultContext;
+	else
+		fContext = context;
+
 	return B_OK;
 }