diff --git a/src/main/java/electrosphere/renderer/texture/Texture.java b/src/main/java/electrosphere/renderer/texture/Texture.java
index e8f5e850..7267da62 100644
--- a/src/main/java/electrosphere/renderer/texture/Texture.java
+++ b/src/main/java/electrosphere/renderer/texture/Texture.java
@@ -214,7 +214,10 @@ public class Texture {
                 this.datatype = GL_UNSIGNED_BYTE;
                 this.glTexImage2D(openGlState, width, height, GL_RGB, GL_UNSIGNED_BYTE, data);
             }
-            glGenerateMipmap(GL_TEXTURE_2D);
+
+            LoggerInterface.loggerRenderer.DEBUG("Generate Mipmap");
+            GL40.glGenerateMipmap(GL_TEXTURE_2D);
+            Globals.renderingEngine.checkError();
             //OPTIONAL free the original image data now that it's on the gpu
             // System.gc();
             //check build status
@@ -323,7 +326,9 @@ public class Texture {
     public void setWrap(OpenGLState openGlState, int wrapDir, int wrapType){
         //TODO: store wrap type for the direction in this object
         openGlState.glBindTexture(GL_TEXTURE_2D,texturePointer);
+        Globals.renderingEngine.checkError();
         glTexParameteri(GL_TEXTURE_2D, wrapDir, wrapType);
+        Globals.renderingEngine.checkError();
     }
 
     /**
@@ -333,7 +338,9 @@ public class Texture {
     public void setBorderColor(OpenGLState openGlState, float borderColor[]){
         this.borderColor = borderColor;
         openGlState.glBindTexture(GL_TEXTURE_2D,texturePointer);
+        Globals.renderingEngine.checkError();
         glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, borderColor);
+        Globals.renderingEngine.checkError();
     }
 
     /**
@@ -343,7 +350,9 @@ public class Texture {
     public void setMinFilter(OpenGLState openGlState, int minFilter){
         this.minFilter = minFilter;
         openGlState.glBindTexture(GL_TEXTURE_2D,texturePointer);
+        Globals.renderingEngine.checkError();
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, minFilter);
+        Globals.renderingEngine.checkError();
     }
 
     /**
@@ -353,7 +362,9 @@ public class Texture {
     public void setMagFilter(OpenGLState openGlState, int maxFilter){
         this.maxFilter = maxFilter;
         openGlState.glBindTexture(GL_TEXTURE_2D,texturePointer);
+        Globals.renderingEngine.checkError();
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, maxFilter);
+        Globals.renderingEngine.checkError();
     }
 
     
@@ -374,7 +385,9 @@ public class Texture {
         int level = 0;
         int border = 0; //this must be 0 according to docs
         openGLState.glBindTexture(GL_TEXTURE_2D,texturePointer);
+        Globals.renderingEngine.checkError();
         GL40.glTexImage2D(GL_TEXTURE_2D, level, format, width, height, border, format, datatype, MemoryUtil.NULL);
+        Globals.renderingEngine.checkError();
     }
 
     /**
@@ -395,7 +408,9 @@ public class Texture {
         int level = 0;
         int border = 0; //this must be 0 according to docs
         openGLState.glBindTexture(GL_TEXTURE_2D,texturePointer);
+        Globals.renderingEngine.checkError();
         GL40.glTexImage2D(GL_TEXTURE_2D, level, format, width, height, border, format, datatype, data);
+        Globals.renderingEngine.checkError();
     }
 
     /**
diff --git a/src/test/java/electrosphere/engine/service/ServiceManagerTests.java b/src/test/java/electrosphere/engine/service/ServiceManagerTests.java
index 0f44691e..c258b1f7 100644
--- a/src/test/java/electrosphere/engine/service/ServiceManagerTests.java
+++ b/src/test/java/electrosphere/engine/service/ServiceManagerTests.java
@@ -73,7 +73,7 @@ public class ServiceManagerTests {
         serviceManager.instantiate();
 
         //verify init was called
-        Mockito.verify(service1Mock, Mockito.calls(1)).init();
+        Mockito.verify(service1Mock, Mockito.times(1)).init();
     }
 
     @FastTest
@@ -90,13 +90,13 @@ public class ServiceManagerTests {
         serviceManager.instantiate();
 
         //verify init was called
-        Mockito.verify(service1Mock, Mockito.calls(1)).init();
+        Mockito.verify(service1Mock, Mockito.times(1)).init();
 
         //destroy
         serviceManager.destroy();
 
         //verify destroy was called
-        Mockito.verify(service1Mock, Mockito.calls(1)).destroy();
+        Mockito.verify(service1Mock, Mockito.times(1)).destroy();
     }
     
 }