diff --git a/[refs] b/[refs]
index 69bfb8815a8c..8c4d00c5c49d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd6840714d9cf6e93f1d42b904860a94df316b85
+refs/heads/master: 2dec51466a08ac1c67da41bfd0518d43d983a2eb
diff --git a/trunk/fs/nfs/client.c b/trunk/fs/nfs/client.c
index 110f80e7bd4c..ec1938d4b814 100644
--- a/trunk/fs/nfs/client.c
+++ b/trunk/fs/nfs/client.c
@@ -269,7 +269,7 @@ struct nfs_client *nfs_find_client(const struct sockaddr_in *addr, int nfsversio
 	clp = __nfs_find_client(addr, nfsversion);
 	spin_unlock(&nfs_client_lock);
 
-	BUG_ON(clp->cl_cons_state == 0);
+	BUG_ON(clp && clp->cl_cons_state == 0);
 
 	return clp;
 }