diff --git a/clang/Sema/SemaDecl.cpp b/clang/Sema/SemaDecl.cpp
index e0ce05770265d68c3ddaa0986adfbe050ae4c08b..cc344633123793e3af8a9f2c014305e5168c1e60 100644
--- a/clang/Sema/SemaDecl.cpp
+++ b/clang/Sema/SemaDecl.cpp
@@ -27,9 +27,9 @@
 using namespace clang;
 
 Sema::DeclTy *Sema::isTypeName(const IdentifierInfo &II, Scope *S) const {
-  Decl *IIDecl = II.getFETokenInfo<Decl>();
-  if (isa<TypedefDecl>(IIDecl) || isa<ObjcInterfaceDecl>(IIDecl))
-    return IIDecl;
+  if (Decl *IIDecl = II.getFETokenInfo<Decl>())
+    if (isa<TypedefDecl>(IIDecl) || isa<ObjcInterfaceDecl>(IIDecl))
+      return IIDecl;
   return 0;
 }