diff --git a/[refs] b/[refs]
index b2942aa09292..3db6067e2f2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 058ad9cbf14b3c7480d01b20280cb4d5858f7a50
+refs/heads/master: 297de4f65698ee1e1c75e27d57933b5fa8227e72
diff --git a/trunk/fs/nfs/client.c b/trunk/fs/nfs/client.c
index a4aa47913a5c..110f80e7bd4c 100644
--- a/trunk/fs/nfs/client.c
+++ b/trunk/fs/nfs/client.c
@@ -1059,6 +1059,8 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data,
 			parent_server->client->cl_xprt->prot,
 			parent_client->retrans_timeo,
 			parent_client->retrans_count);
+	if (error < 0)
+		goto error;
 
 	/* Initialise the client representation from the parent server */
 	nfs_server_copy_userdata(server, parent_server);