diff --git a/Project/Tutorial04/Tutorial04.cpp b/Project/Tutorial04/Tutorial04.cpp
index 92da69f..3465064 100644
--- a/Project/Tutorial04/Tutorial04.cpp
+++ b/Project/Tutorial04/Tutorial04.cpp
@@ -623,6 +623,7 @@ namespace ApiWithoutSecrets {
   bool Tutorial04::CreateFramebuffer( VkFramebuffer &framebuffer, VkImageView image_view ) {
     if( framebuffer != VK_NULL_HANDLE ) {
       vkDestroyFramebuffer( GetDevice(), framebuffer, nullptr );
+      framebuffer = VK_NULL_HANDLE;
     }
 
     VkFramebufferCreateInfo framebuffer_create_info = {
diff --git a/Project/Tutorial05/Tutorial05.cpp b/Project/Tutorial05/Tutorial05.cpp
index 71b7add..3237f4b 100644
--- a/Project/Tutorial05/Tutorial05.cpp
+++ b/Project/Tutorial05/Tutorial05.cpp
@@ -542,7 +542,7 @@ namespace ApiWithoutSecrets {
     vkCmdCopyBuffer( command_buffer, Vulkan.StagingBuffer.Handle, Vulkan.VertexBuffer.Handle, 1, &buffer_copy_info );
 
     VkBufferMemoryBarrier buffer_memory_barrier = {
-      VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,          // VkStructureType                        sType;
+      VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,          // VkStructureType                        sType
       nullptr,                                          // const void                            *pNext
       VK_ACCESS_MEMORY_WRITE_BIT,                       // VkAccessFlags                          srcAccessMask
       VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT,              // VkAccessFlags                          dstAccessMask
@@ -696,6 +696,7 @@ namespace ApiWithoutSecrets {
   bool Tutorial05::CreateFramebuffer( VkFramebuffer &framebuffer, VkImageView image_view ) {
     if( framebuffer != VK_NULL_HANDLE ) {
       vkDestroyFramebuffer( GetDevice(), framebuffer, nullptr );
+      framebuffer = VK_NULL_HANDLE;
     }
 
     VkFramebufferCreateInfo framebuffer_create_info = {
diff --git a/Project/Tutorial06/Tutorial06.cpp b/Project/Tutorial06/Tutorial06.cpp
index 021f1e8..25ca49b 100644
--- a/Project/Tutorial06/Tutorial06.cpp
+++ b/Project/Tutorial06/Tutorial06.cpp
@@ -1026,6 +1026,7 @@ namespace ApiWithoutSecrets {
   bool Tutorial06::CreateFramebuffer( VkFramebuffer &framebuffer, VkImageView image_view ) {
     if( framebuffer != VK_NULL_HANDLE ) {
       vkDestroyFramebuffer( GetDevice(), framebuffer, nullptr );
+      framebuffer = VK_NULL_HANDLE;
     }
 
     VkFramebufferCreateInfo framebuffer_create_info = {
diff --git a/Project/Tutorial07/Tutorial07.cpp b/Project/Tutorial07/Tutorial07.cpp
index 296a522..9ebea27 100644
--- a/Project/Tutorial07/Tutorial07.cpp
+++ b/Project/Tutorial07/Tutorial07.cpp
@@ -1161,6 +1161,7 @@ namespace ApiWithoutSecrets {
   bool Tutorial07::CreateFramebuffer( VkFramebuffer &framebuffer, VkImageView image_view ) {
     if( framebuffer != VK_NULL_HANDLE ) {
       vkDestroyFramebuffer( GetDevice(), framebuffer, nullptr );
+      framebuffer = VK_NULL_HANDLE;
     }
 
     VkFramebufferCreateInfo framebuffer_create_info = {