diff --git a/.changeset/wet-lobsters-accept.md b/.changeset/wet-lobsters-accept.md
new file mode 100644
index 000000000..bd6c70754
--- /dev/null
+++ b/.changeset/wet-lobsters-accept.md
@@ -0,0 +1,5 @@
+---
+'@chugsplash/core': patch
+---
+
+Fixes a couple errors when deploying no-proxy contracts
diff --git a/packages/core/src/config/parse.ts b/packages/core/src/config/parse.ts
index c104e937d..354746232 100644
--- a/packages/core/src/config/parse.ts
+++ b/packages/core/src/config/parse.ts
@@ -933,7 +933,10 @@ const parseContractVariables = (
   cre: ChugSplashRuntimeEnvironment
 ): ParsedConfigVariables => {
   const parsedConfigVariables: ParsedConfigVariables = {}
-  if (!contractConfig.variables) {
+  if (
+    !contractConfig.variables ||
+    Object.keys(contractConfig.variables).length === 0
+  ) {
     return {}
   }
 
diff --git a/packages/core/src/languages/solidity/storage.ts b/packages/core/src/languages/solidity/storage.ts
index 727c67acb..b9876b81b 100644
--- a/packages/core/src/languages/solidity/storage.ts
+++ b/packages/core/src/languages/solidity/storage.ts
@@ -627,6 +627,10 @@ export const computeStorageSegments = (
   contractConfig: ParsedContractConfig,
   dereferencer: ASTDereferencer
 ): Array<StorageSlotSegment> => {
+  if (contractConfig.kind === 'no-proxy') {
+    return []
+  }
+
   let segments: StorageSlotSegment[] = []
   for (const storageObj of Object.values(extendedLayout.storage)) {
     const configVarValue = contractConfig.variables[storageObj.configVarName]