diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7eeb8d87..ff42710a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ Control Panel:
 
 * The SSL (now "TLS") certificates page now supports provisioning free SSL certificates from Let's Encrypt.
 * Report free memory usage.
+* Fix a crash when the git directory is not checked out to a tag.
 
 System:
 
diff --git a/management/status_checks.py b/management/status_checks.py
index 74116f23..6dcd0214 100755
--- a/management/status_checks.py
+++ b/management/status_checks.py
@@ -751,8 +751,13 @@ def check_miab_version(env, output):
 	if config.get("privacy", True):
 		output.print_warning("Mail-in-a-Box version check disabled by privacy setting.")
 	else:
-		this_ver = what_version_is_this(env)
+		try:
+			this_ver = what_version_is_this(env)
+		except:
+			this_ver = "Unknown"
+
 		latest_ver = get_latest_miab_version()
+
 		if this_ver == latest_ver:
 			output.print_ok("Mail-in-a-Box is up to date. You are running version %s." % this_ver)
 		else: