diff --git a/convex-core/src/main/java/convex/core/lang/Context.java b/convex-core/src/main/java/convex/core/lang/Context.java
index 586e2d61b..1cc8fab86 100644
--- a/convex-core/src/main/java/convex/core/lang/Context.java
+++ b/convex-core/src/main/java/convex/core/lang/Context.java
@@ -141,7 +141,7 @@ public CVMLong getPosition(Symbol sym) {
 	}
 
 	/**
-	 * Inner class for less-frequently changing CVM state related to Actor execution
+	 * Immutable inner class for less-frequently changing CVM state
 	 * Should save some allocation / GC on average, since it will change less
 	 * frequently than the surrounding Context and can be cheaply copied by reference.
 	 *
diff --git a/convex-core/src/main/java/convex/core/lang/exception/ErrorValue.java b/convex-core/src/main/java/convex/core/lang/exception/ErrorValue.java
index 9995940ba..c63ca5abb 100644
--- a/convex-core/src/main/java/convex/core/lang/exception/ErrorValue.java
+++ b/convex-core/src/main/java/convex/core/lang/exception/ErrorValue.java
@@ -38,8 +38,16 @@ public class ErrorValue extends AThrowable {
 	private Address address=null;
 	
 	static {
-		addDefaultError(ErrorCodes.ARGUMENT,"Invalid argument value");
+		addDefaultError(ErrorCodes.ARGUMENT,"Invalid argument");
 		addDefaultError(ErrorCodes.NOBODY,"Account does not exist");
+		addDefaultError(ErrorCodes.FUNDS,"Funds not available");
+		addDefaultError(ErrorCodes.JUICE,"Out of juice");
+		addDefaultError(ErrorCodes.CAST,"Illegal type cast");
+		addDefaultError(ErrorCodes.ASSERT,"Assertion failed");
+		addDefaultError(ErrorCodes.ARITY,"Wrong number of arguments");
+		addDefaultError(ErrorCodes.BOUNDS,"Out of bounds");
+		addDefaultError(ErrorCodes.TODO,"Not implemented");
+		addDefaultError(ErrorCodes.MEMORY,"Out of memory");
 	}
 
 	private ErrorValue(ACell code, ACell message) {