diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c
index 397b5e6e..5344cf39 100644
--- a/lasso/id-ff/provider.c
+++ b/lasso/id-ff/provider.c
@@ -326,6 +326,7 @@ lasso_provider_get_first_http_method(LassoProvider *provider,
 	const gchar *role_prefix;
 
 	g_return_val_if_fail(LASSO_IS_PROVIDER(provider), LASSO_HTTP_METHOD_NONE);
+	g_return_val_if_fail(remote_provider != NULL, LASSO_HTTP_METHOD_NONE);
 	if (provider->private_data->conformance == LASSO_PROTOCOL_SAML_2_0) {
 		return lasso_saml20_provider_get_first_http_method(
 				provider, remote_provider, protocol_type);
diff --git a/lasso/saml-2.0/profile.c b/lasso/saml-2.0/profile.c
index 64854827..106145a4 100644
--- a/lasso/saml-2.0/profile.c
+++ b/lasso/saml-2.0/profile.c
@@ -933,6 +933,9 @@ lasso_saml20_profile_build_request_msg(LassoProfile *profile, const char *servic
 	if (url) {
 		lasso_assign_string(((LassoSamlp2RequestAbstract*)profile->request)->Destination,
 				url);
+	} else {
+		rc = LASSO_PROFILE_ERROR_UNKNOWN_PROFILE_URL;
+		goto cleanup;
 	}
 
 	switch (method) {