diff --git a/bshell.runtime/command/command.c b/bshell.runtime/command/command.c
index ad78609..6e77f88 100644
--- a/bshell.runtime/command/command.c
+++ b/bshell.runtime/command/command.c
@@ -112,6 +112,10 @@ static fx_status get_version(
 	fx_value_get_object(cmd_v, &cmd);
 	const fx_type *ty = fx_type_get_by_id(fx_object_query_type(cmd));
 	const fx_assembly *assembly = fx_type_get_assembly(ty);
+	if (!assembly) {
+		*out = FX_VALUE_EMPTY;
+		return FX_SUCCESS;
+	}
 
 	long major = 0, minor = 0, build = 0, revision = 0;
 	fx_assembly_get_version(assembly, &major, &minor, &build, &revision);
@@ -148,7 +152,12 @@ static fx_status get_source(
 	const fx_type *ty = fx_type_get_by_id(fx_object_query_type(cmd));
 	const fx_assembly *assembly = fx_type_get_assembly(ty);
 
-	*out = FX_CSTR(fx_assembly_get_name(assembly));
+	if (assembly) {
+		*out = FX_CSTR(fx_assembly_get_name(assembly));
+	} else {
+		*out = FX_VALUE_EMPTY;
+	}
+
 	return FX_SUCCESS;
 }