diff --git a/source/addonHandler/__init__.py b/source/addonHandler/__init__.py
index 75da59af505..4da8f0d82c8 100644
--- a/source/addonHandler/__init__.py
+++ b/source/addonHandler/__init__.py
@@ -292,6 +292,9 @@ def __init__(self, path):
 					translatedInput = open(p, 'rb')
 					break
 			self.manifest = AddonManifest(f, translatedInput)
+			if self.manifest.errors is not None:
+				_report_manifest_errors(self.manifest)
+				raise AddonError("Manifest file has errors.")
 
 	@property
 	def isPendingInstall(self):
@@ -714,6 +717,8 @@ def _validateApiVersionRange(self):
 
 def validate_apiVersionString(value):
 	from configobj.validate import ValidateError
+	if not value or value == "None":
+		return (0, 0, 0)
 	if not isinstance(value, string_types):
 		raise ValidateError('Expected an apiVersion in the form of a string. EG "2019.1.0"')
 	try: