diff --git a/examples/OpenGLWindow/GLInstancingRenderer.cpp b/examples/OpenGLWindow/GLInstancingRenderer.cpp
index b89309aab..a92500af7 100644
--- a/examples/OpenGLWindow/GLInstancingRenderer.cpp
+++ b/examples/OpenGLWindow/GLInstancingRenderer.cpp
@@ -971,10 +971,10 @@ int	GLInstancingRenderer::registerTexture(const unsigned char* texels, int width
 
 void    GLInstancingRenderer::replaceTexture(int shapeIndex, int textureId)
 {
-	if (shapeIndex >=0 && shapeIndex < m_data->m_textureHandles.size())
+	if ((shapeIndex >=0) && (shapeIndex < m_graphicsInstances.size()))
 	{
 		b3GraphicsInstance* gfxObj = m_graphicsInstances[shapeIndex];
-		if (textureId>=0)
+		if (textureId>=0 && textureId < m_data->m_textureHandles.size())
 		{
 			gfxObj->m_textureIndex = textureId;
 			gfxObj->m_flags |= eGfxHasTexture;
@@ -985,7 +985,7 @@ void    GLInstancingRenderer::replaceTexture(int shapeIndex, int textureId)
 
 void    GLInstancingRenderer::updateTexture(int textureIndex, const unsigned char* texels, bool flipPixelsY)
 {
-    if (textureIndex>=0)
+    if ((textureIndex>=0) && (textureIndex < m_data->m_textureHandles.size()))
     {
         glActiveTexture(GL_TEXTURE0);
         b3Assert(glGetError() ==GL_NO_ERROR);
@@ -1027,7 +1027,7 @@ void GLInstancingRenderer::activateTexture(int textureIndex)
 {
     glActiveTexture(GL_TEXTURE0);
     
-    if (textureIndex>=0)
+    if (textureIndex>=0 && textureIndex < m_data->m_textureHandles.size())
     {
         glBindTexture(GL_TEXTURE_2D,m_data->m_textureHandles[textureIndex].m_glTexture);
     } else
diff --git a/examples/pybullet/pybullet.c b/examples/pybullet/pybullet.c
index 5a4c4cda0..aa6c4c63c 100644
--- a/examples/pybullet/pybullet.c
+++ b/examples/pybullet/pybullet.c
@@ -7138,13 +7138,14 @@ static PyObject* pybullet_calculateJacobian(PyObject* self, PyObject* args, PyOb
 						pybullet_internalGetFloatFromSequence(objAccelerations, i);
 				}
 				{
-					b3SharedMemoryStatusHandle statusHandle;					
+					b3SharedMemoryStatusHandle statusHandle;	
+					int statusType;
 					b3SharedMemoryCommandHandle commandHandle =
 						b3CalculateJacobianCommandInit(sm, bodyUniqueId,
 							linkIndex, localPoint, jointPositions,
 							jointVelocities, jointAccelerations);
 					statusHandle = b3SubmitClientCommandAndWaitStatus(sm, commandHandle);
-					int statusType = b3GetStatusType(statusHandle);
+					statusType = b3GetStatusType(statusHandle);
 					if (statusType == CMD_CALCULATED_JACOBIAN_COMPLETED)
 					{
 						int dofCount;