diff --git a/renderdoc/driver/gl/gl_shader_refl.cpp b/renderdoc/driver/gl/gl_shader_refl.cpp
index 470afd035..8ff9c68c6 100644
--- a/renderdoc/driver/gl/gl_shader_refl.cpp
+++ b/renderdoc/driver/gl/gl_shader_refl.cpp
@@ -1773,9 +1773,11 @@ void GetBindpointMapping(const GLHookSet &gl, GLuint curProg, int shadIdx, Shade
 		eGL_REFERENCED_BY_FRAGMENT_SHADER,
 		eGL_REFERENCED_BY_COMPUTE_SHADER,
 	};
+
+	int32_t numResources = refl ? refl->Resources.count : 0;
 	
-	create_array_uninit(mapping.Resources, refl->Resources.count);
-	for(int32_t i=0; i < refl->Resources.count; i++)
+	create_array_uninit(mapping.Resources, numResources);
+	for(int32_t i=0; i < numResources; i++)
 	{
 		if(refl->Resources.elems[i].IsTexture)
 		{
@@ -1882,8 +1884,10 @@ void GetBindpointMapping(const GLHookSet &gl, GLuint curProg, int shadIdx, Shade
 		}
 	}
 	
-	create_array_uninit(mapping.ConstantBlocks, refl->ConstantBlocks.count);
-	for(int32_t i=0; i < refl->ConstantBlocks.count; i++)
+	int32_t numCBlocks = refl ? refl->ConstantBlocks.count : 0;
+	
+	create_array_uninit(mapping.ConstantBlocks, numCBlocks);
+	for(int32_t i=0; i < numCBlocks; i++)
 	{
 		if(refl->ConstantBlocks.elems[i].bufferBacked)
 		{
@@ -1927,7 +1931,7 @@ void GetBindpointMapping(const GLHookSet &gl, GLuint curProg, int shadIdx, Shade
 		mapping.InputAttributes[i] = -1;
 
 	// override identity map with bindings
-	if(shadIdx == 0)
+	if(shadIdx == 0 && refl)
 	{
 		for(int32_t i=0; i < refl->InputSig.count; i++)
 		{
diff --git a/renderdocui/Windows/ShaderViewer.cs b/renderdocui/Windows/ShaderViewer.cs
index 2ed6fe85c..24cc8c5a9 100644
--- a/renderdocui/Windows/ShaderViewer.cs
+++ b/renderdocui/Windows/ShaderViewer.cs
@@ -450,9 +450,9 @@ namespace renderdocui.Windows
             else
                 Text = m_Core.CurPipelineState.GetShaderName(stage);
 
-            var disasm = shader.Disassembly;
+            var disasm = shader != null ? shader.Disassembly : "";
 
-            if (m_Core.Config.ShaderViewer_FriendlyNaming)
+            if (m_Core.Config.ShaderViewer_FriendlyNaming && m_ShaderDetails != null)
             {
                 for (int i = 0; i < m_ShaderDetails.ConstantBlocks.Length; i++)
                 {
@@ -543,7 +543,7 @@ namespace renderdocui.Windows
                 w.CloseButtonVisible = false;
             }
 
-            if (shader.DebugInfo.entryFunc.Length > 0 && shader.DebugInfo.files.Length > 0)
+            if (shader != null && shader.DebugInfo.entryFunc.Length > 0 && shader.DebugInfo.files.Length > 0)
             {
                 if(trace != null)
                     Text = String.Format("Debug {0}() - {1}", shader.DebugInfo.entryFunc, debugContext);
@@ -621,35 +621,38 @@ namespace renderdocui.Windows
                 insig.Show(dockPanel, DockState.DockBottom);
                 outsig.Show(insig.Pane, DockAlignment.Right, 0.5);
 
-                foreach (var s in m_ShaderDetails.InputSig)
+                if (m_ShaderDetails != null)
                 {
-                    string name = s.varName.Length == 0 ? s.semanticName : String.Format("{0} ({1})", s.varName, s.semanticName);
-                    if (s.semanticName.Length == 0) name = s.varName;
-
-                    inSig.Nodes.Add(new object[] { name, s.semanticIndex, s.regIndex, s.TypeString, s.systemValue.ToString(),
-                                                                SigParameter.GetComponentString(s.regChannelMask), SigParameter.GetComponentString(s.channelUsedMask) });
-                }
-
-                bool multipleStreams = false;
-                for (int i = 0; i < m_ShaderDetails.OutputSig.Length; i++)
-                {
-                    if (m_ShaderDetails.OutputSig[i].stream > 0)
+                    foreach (var s in m_ShaderDetails.InputSig)
                     {
-                        multipleStreams = true;
-                        break;
-                    }
-                }
+                        string name = s.varName.Length == 0 ? s.semanticName : String.Format("{0} ({1})", s.varName, s.semanticName);
+                        if (s.semanticName.Length == 0) name = s.varName;
 
-                foreach (var s in m_ShaderDetails.OutputSig)
-                {
-                    string name = s.varName.Length == 0 ? s.semanticName : String.Format("{0} ({1})", s.varName, s.semanticName);
-                    if (s.semanticName.Length == 0) name = s.varName;
-
-                    if(multipleStreams)
-                        name = String.Format("Stream {0} : {1}", s.stream, name);
-
-                    outSig.Nodes.Add(new object[] { name, s.semanticIndex, s.regIndex, s.TypeString, s.systemValue.ToString(),
+                        inSig.Nodes.Add(new object[] { name, s.semanticIndex, s.regIndex, s.TypeString, s.systemValue.ToString(),
                                                                 SigParameter.GetComponentString(s.regChannelMask), SigParameter.GetComponentString(s.channelUsedMask) });
+                    }
+
+                    bool multipleStreams = false;
+                    for (int i = 0; i < m_ShaderDetails.OutputSig.Length; i++)
+                    {
+                        if (m_ShaderDetails.OutputSig[i].stream > 0)
+                        {
+                            multipleStreams = true;
+                            break;
+                        }
+                    }
+
+                    foreach (var s in m_ShaderDetails.OutputSig)
+                    {
+                        string name = s.varName.Length == 0 ? s.semanticName : String.Format("{0} ({1})", s.varName, s.semanticName);
+                        if (s.semanticName.Length == 0) name = s.varName;
+
+                        if (multipleStreams)
+                            name = String.Format("Stream {0} : {1}", s.stream, name);
+
+                        outSig.Nodes.Add(new object[] { name, s.semanticIndex, s.regIndex, s.TypeString, s.systemValue.ToString(),
+                                                                SigParameter.GetComponentString(s.regChannelMask), SigParameter.GetComponentString(s.channelUsedMask) });
+                    }
                 }
             }
             else