Fixed a couple of issues with the sample OAuth SP in handling desktop consumers.

2 files changed, 2 insertions, 2 deletions

diff --git a/samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs b/samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs
index 1255717..db8f469 100644
--- a/samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs
+++ b/samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs
@@ -26,7 +26,7 @@ public partial class OAuthConsumer : IConsumerDescription {
 	}
 
 	Uri IConsumerDescription.Callback {
-		get { return this.Callback != null ? new Uri(this.Callback) : null; }
+		get { return string.IsNullOrEmpty(this.Callback) ? null : new Uri(this.Callback); }
 	}
 
 	DotNetOpenAuth.OAuth.VerificationCodeFormat IConsumerDescription.VerificationCodeFormat {
diff --git a/samples/OAuthServiceProvider/App_Code/OAuthToken.cs b/samples/OAuthServiceProvider/App_Code/OAuthToken.cs
index ec9b31e..2f26799 100644
--- a/samples/OAuthServiceProvider/App_Code/OAuthToken.cs
+++ b/samples/OAuthServiceProvider/App_Code/OAuthToken.cs
@@ -26,7 +26,7 @@ public partial class OAuthToken : IServiceProviderRequestToken {
 	}
 
 	Uri IServiceProviderRequestToken.Callback {
-		get { return new Uri(this.RequestTokenCallback); }
+		get { return string.IsNullOrEmpty(this.RequestTokenCallback) ? null : new Uri(this.RequestTokenCallback); }
 		set { this.RequestTokenCallback = value.AbsoluteUri; }
 	}