diff --git a/openVulkanoCpp/Base/Version.cpp b/openVulkanoCpp/Base/Version.cpp
index 5e8abb3..fb92c13 100644
--- a/openVulkanoCpp/Base/Version.cpp
+++ b/openVulkanoCpp/Base/Version.cpp
@@ -33,7 +33,7 @@ namespace OpenVulkano
 					if (versionStr.size() == 1) return;
 				}
 				ReadVersionComponents(versionComponents, versionStr, offset);
-				if (versionStr[offset] == '-')
+				if (offset < versionStr.size() && versionStr[offset] == '-')
 				{
 					offset++;
 					ReadTagComponents(tagComponents, versionStr, offset);
@@ -61,7 +61,7 @@ namespace OpenVulkano
 					int blockStart = offset;
 					while (versionStr.size() > offset && versionStr[offset] >= '0' && versionStr[offset] <= '9') offset++;
 					comps.push_back(ToNumber(versionStr.substr(blockStart, offset - blockStart)));
-					if (versionStr[offset] != '.') break;
+					if (offset < versionStr.size() && versionStr[offset] != '.') break;
 					offset++;
 				} while(versionStr.size() > offset);
 			}