diff --git a/src/004-base/facility.js b/src/004-base/facility.js
index 786753d5c498e9f05b92ca5fa896d4dc281b3fcf..dbfcf5be075cab9fc60d10ab5d5cd08a70547730 100644
--- a/src/004-base/facility.js
+++ b/src/004-base/facility.js
@@ -322,7 +322,7 @@ App.Entity.Facilities.Facility = class {
 	/** Facility slave capacity
 	 * @returns {number} */
 	get capacity() {
-		return (typeof V[this.desc.baseName] === "object") ? V[this.desc.baseName].capacity : V[this.desc.baseName];
+		return V[this.desc.baseName] !== null && ((typeof V[this.desc.baseName] === "object") ? V[this.desc.baseName].capacity : V[this.desc.baseName]);
 	}
 
 	get established() {
@@ -382,7 +382,7 @@ App.Entity.Facilities.Facility = class {
 	 * @returns {number}
 	 */
 	upgrade(name) {
-		return this.option("Upgrade" + name);
+		return (typeof V[this.desc.baseName] === "object") ? V[this.desc.baseName].upgrade[name] : this.option("Upgrade" + name);
 	}
 
 	/** Can this facility be decorated? */