diff --git a/kraken/KRCamera.cpp b/kraken/KRCamera.cpp
index 4385e1d..c76c600 100755
--- a/kraken/KRCamera.cpp
+++ b/kraken/KRCamera.cpp
@@ -592,10 +592,6 @@ void KRCamera::renderPost(VkCommandBuffer& commandBuffer, KRSurface& surface)
 //        m_pContext->getTextureManager()->_setActiveTexture(0);
 //        GLDEBUG(glBindTexture(GL_TEXTURE_2D, 0));
 //    }
-    
-    // TODO - Test code for Vulkan conversion, remove once texture streaming working
-    // m_pContext->getTextureManager()->selectTexture(0, m_pContext->getTextureManager()->getTexture("font"), 0.0f, KRTexture::TEXTURE_USAGE_UI);
-
     const char *szText = settings.m_debug_text.c_str();
     
     std::string debug_text;
@@ -605,6 +601,9 @@ void KRCamera::renderPost(VkCommandBuffer& commandBuffer, KRSurface& surface)
             szText = debug_text.c_str();
         }
     }
+
+    // TODO - Test code for Vulkan conversion, remove once texture streaming working
+    szText = "Hello, earthlings!";
     
     if(*szText) {
         int row_count = 1;
diff --git a/kraken/KRMeshManager.cpp b/kraken/KRMeshManager.cpp
index 3d8fb00..0dc1d33 100755
--- a/kraken/KRMeshManager.cpp
+++ b/kraken/KRMeshManager.cpp
@@ -644,7 +644,7 @@ void KRMeshManager::KRVBOData::bind(VkCommandBuffer& commandBuffer)
   VkDeviceSize offsets[] = { 0 };
   vkCmdBindVertexBuffers(commandBuffer, 0, 1, vertexBuffers, offsets);
 
-  if (m_index_data->getSize() > 0) {
+  if (m_index_data && m_index_data->getSize() > 0) {
     // TODO - Support 32-bit index buffers
     vkCmdBindIndexBuffer(commandBuffer, getIndexBuffer(), 0, VK_INDEX_TYPE_UINT16);
   }