diff --git a/lib/DXIL/DxilModule.cpp b/lib/DXIL/DxilModule.cpp
index 9053749f39..a13cd308a0 100644
--- a/lib/DXIL/DxilModule.cpp
+++ b/lib/DXIL/DxilModule.cpp
@@ -247,7 +247,9 @@ const Function *DxilModule::GetEntryFunction() const {
 llvm::SmallVector<llvm::Function *, 64> DxilModule::GetExportedFunctions() const {
     llvm::SmallVector<llvm::Function *, 64> ret;
     for (auto const& fn : m_DxilEntryPropsMap) {
+      if (fn.first != nullptr) {
         ret.push_back(const_cast<llvm::Function*>(fn.first));
+      }
     }
     return ret;
 }
diff --git a/lib/DxilPIXPasses/PixPassHelpers.cpp b/lib/DxilPIXPasses/PixPassHelpers.cpp
index 9059f4ae63..2955c37ec2 100644
--- a/lib/DxilPIXPasses/PixPassHelpers.cpp
+++ b/lib/DxilPIXPasses/PixPassHelpers.cpp
@@ -203,10 +203,10 @@ std::vector<llvm::BasicBlock*> GetAllBlocks(hlsl::DxilModule& DM) {
     std::vector<llvm::BasicBlock*> ret;
     auto entryPoints = DM.GetExportedFunctions();
     for (auto& fn : entryPoints) {
-        auto & blocks = fn->getBasicBlockList();
-        for (auto & block : blocks) {
-            ret.push_back(&block);
-        }
+      auto& blocks = fn->getBasicBlockList();
+      for (auto& block : blocks) {
+        ret.push_back(&block);
+      }
     }
     return ret;
 }