diff --git a/openVulkanoCpp/Base/Version.cpp b/openVulkanoCpp/Base/Version.cpp
index c2c6547..f9f39cc 100644
--- a/openVulkanoCpp/Base/Version.cpp
+++ b/openVulkanoCpp/Base/Version.cpp
@@ -34,7 +34,7 @@ namespace OpenVulkano
 					offset++;
 					ReadTagComponents(tagComponents, versionStr, offset);
 				}
-				if (versionStr.size() - 3 > offset && versionStr[offset] == ' ' && versionStr[offset + 1] == '(' && versionStr.back() == ')')
+				if (versionStr.size() > 3 && versionStr.size() - 3 > offset && versionStr[offset] == ' ' && versionStr[offset + 1] == '(' && versionStr.back() == ')')
 				{
 					ReadVersionComponents(appleBuildComponents, versionStr, offset);
 					if (versionStr[offset] != ')') appleBuildComponents.clear();
@@ -69,7 +69,7 @@ namespace OpenVulkano
 					size_t blockStart = offset;
 					while (versionStr.size() > offset && versionStr[offset] != '-' && versionStr[offset] != ' ' && versionStr[offset] != '\0') offset++;
 					tags.emplace_back(versionStr.data() + blockStart, offset - blockStart);
-					if (versionStr[offset] == ' ' || versionStr[offset] == '\0') break;
+					if (offset >= versionStr.size() || versionStr[offset] == ' ' || versionStr[offset] == '\0') break;
 					offset++;
 				} while (versionStr.size() > offset);
 			}