diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index c1e68f2279..c13d580106 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -712,25 +712,24 @@ static void WriteStage(char *&p, int n, u32 texture_mask)
         if(!bHasIndStage) {
             // calc tevcord
             //tevcoord.xy = texdim[1].xy * uv1.xy / uv1.z;
-            int OurTexCoord = 0;
-            if(bpmem.genMode.numtexgens)
-                OurTexCoord = texcoord;
-            else
-                OurTexCoord = 0;
-            if (texture_mask & (1<<texmap)) {
-                // nonpow2
-                if (texfun == XF_TEXPROJ_STQ )
-                    WRITE(p, "tevcoord.xy = uv%d.xy / uv%d.z;\n", texcoord, OurTexCoord);
-                else
-                    WRITE(p, "tevcoord.xy = uv%d.xy;\n", OurTexCoord);
-                WrapNonPow2Tex(p, "tevcoord", texmap, texture_mask);
-            }
-            else {
-                if (texfun == XF_TEXPROJ_STQ ) 
-                    WRITE(p, "tevcoord.xy = "I_TEXDIMS"[%d].xy * uv%d.xy / uv%d.z;\n", texmap, OurTexCoord , OurTexCoord );
-                else 
-                    WRITE(p, "tevcoord.xy = "I_TEXDIMS"[%d].xy * uv%d.xy;\n", texmap, OurTexCoord);
-
+            if(bpmem.genMode.numtexgens) {
+                if (texture_mask & (1<<texmap)) {
+                    // nonpow2
+                    if (texfun == XF_TEXPROJ_STQ )
+                        WRITE(p, "tevcoord.xy = uv%d.xy / uv%d.z;\n", texcoord, texcoord);
+                    else
+                        WRITE(p, "tevcoord.xy = uv%d.xy;\n", texcoord);
+                    WrapNonPow2Tex(p, "tevcoord", texmap, texture_mask);
+                }
+                else {
+                    if (texfun == XF_TEXPROJ_STQ ) 
+                        WRITE(p, "tevcoord.xy = "I_TEXDIMS"[%d].xy * uv%d.xy / uv%d.z;\n", texmap, texcoord , texcoord );
+                    else 
+                        WRITE(p, "tevcoord.xy = "I_TEXDIMS"[%d].xy * uv%d.xy;\n", texmap, texcoord);
+                }
+            } else {
+                // donkopunchstania - check that this is correct when there are no tex gens
+                WRITE(p, "tevcoord.xy = float2(0.0f,0.0f);\n");
             }
         }
         else if (texture_mask & (1<<texmap)) {
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
index 3eb09b3eda..e174bcaa09 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
@@ -38,6 +38,7 @@ static int s_nMaxPixelInstructions;
 static GLuint s_ColorMatrixProgram = 0;
 PixelShaderCache::PSCache PixelShaderCache::pshaders;
 PIXELSHADERUID PixelShaderCache::s_curuid;
+bool PixelShaderCache::s_displayCompileAlert;
 
 static FRAGMENTSHADER* pShaderLast = NULL;
 
@@ -55,6 +56,8 @@ void PixelShaderCache::Init()
 {
 	GL_REPORT_ERRORD();
 
+    s_displayCompileAlert = true;
+
 	glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB, (GLint *)&s_nMaxPixelInstructions);
 	
 	int maxinst, maxattribs;
@@ -178,6 +181,11 @@ bool PixelShaderCache::CompilePixelShader(FRAGMENTSHADER& ps, const char* pstrpr
 	const char *opts[] = {"-profileopts", stropt, "-O2", "-q", NULL};
 	CGprogram tempprog = cgCreateProgram(g_cgcontext, CG_SOURCE, pstrprogram, g_cgfProf, "main", opts);
 	if (!cgIsProgram(tempprog) || cgGetError() != CG_NO_ERROR) {
+        if (s_displayCompileAlert) {
+            PanicAlert("Failed to create pixel shader");
+            s_displayCompileAlert = false;
+        }
+        cgDestroyProgram(tempprog);
 		ERROR_LOG(VIDEO, "Failed to create ps %s:\n", cgGetLastListing(g_cgcontext));
 		ERROR_LOG(VIDEO, pstrprogram);
 		return false;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h
index 0a544e1f84..c6956c7eb2 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h
@@ -51,6 +51,8 @@ class PixelShaderCache
 
 	static PIXELSHADERUID s_curuid; // the current pixel shader uid (progressively changed as memory is written)
 
+    static bool s_displayCompileAlert;
+
 public:
 	static void Init();
 	static void ProgressiveCleanup();
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
index 902655fe22..7361727874 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
@@ -37,6 +37,7 @@
 #include "ImageWrite.h"
 
 VertexShaderCache::VSCache VertexShaderCache::vshaders;
+bool VertexShaderCache::s_displayCompileAlert;
 
 static VERTEXSHADER *pShaderLast = NULL;
 static int s_nMaxVertexInstructions;
@@ -54,7 +55,9 @@ void SetVSConstant4fv(int const_number, const float *f)
 
 void VertexShaderCache::Init()
 {
-	glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB, (GLint *)&s_nMaxVertexInstructions);
+	s_displayCompileAlert = true;
+
+    glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB, (GLint *)&s_nMaxVertexInstructions);
 }
 
 void VertexShaderCache::Shutdown()
@@ -137,6 +140,11 @@ bool VertexShaderCache::CompileVertexShader(VERTEXSHADER& vs, const char* pstrpr
 	const char *opts[] = {"-profileopts", stropt, "-O2", "-q", NULL};
 	CGprogram tempprog = cgCreateProgram(g_cgcontext, CG_SOURCE, pstrprogram, g_cgvProf, "main", opts);
 	if (!cgIsProgram(tempprog) || cgGetError() != CG_NO_ERROR) {
+        if (s_displayCompileAlert) {
+            PanicAlert("Failed to create vertex shader");
+            s_displayCompileAlert = false;
+        }
+        cgDestroyProgram(tempprog);
 		ERROR_LOG(VIDEO, "Failed to load vs %s:\n", cgGetLastListing(g_cgcontext));
 		ERROR_LOG(VIDEO, pstrprogram);
 		return false;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
index 5d0ed09837..7f5b274ba0 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
@@ -49,6 +49,8 @@ class VertexShaderCache
 
 	static VSCache vshaders;
 
+    static bool s_displayCompileAlert;
+
 public:
 	static void Init();
 	static void ProgressiveCleanup();