diff --git a/src/main/java/com/eactive/apim/portal/portalorg/entity/OrgCodeGenerator.java b/src/main/java/com/eactive/apim/portal/portalorg/entity/OrgCodeGenerator.java
index 067c287..526cd11 100644
--- a/src/main/java/com/eactive/apim/portal/portalorg/entity/OrgCodeGenerator.java
+++ b/src/main/java/com/eactive/apim/portal/portalorg/entity/OrgCodeGenerator.java
@@ -42,12 +42,12 @@ public class OrgCodeGenerator implements ValueGenerator<String> {
 
         String schema = System.getProperty("eai.tableowner", "");
 
-        if (schema.isEmpty()) {
+        if (schema == null || schema.isEmpty()) {
             log.error("ems.schema is empty.");
             throw new IllegalStateException("System property 'eai.tableowner' is not set. Please configure 'eai.tableowner' or 'ems.datasource.schema'(developer portal).");
         }
 
-        String TABLE_NAME_WITH_SCHEMA = System.getProperty("ems.schema", "") + "." + TABLE_NAME;
+        String TABLE_NAME_WITH_SCHEMA = schema + "." + TABLE_NAME;
 
         this.CHECK_EXISTS_SQL = "SELECT COUNT(*) FROM " + TABLE_NAME_WITH_SCHEMA + " WHERE TABLE_NAME = 'PTL_ORG'";
         this.INSERT_SQL = "INSERT INTO " + TABLE_NAME_WITH_SCHEMA + " (TABLE_NAME, NEXT_ID) VALUES ('PTL_ORG', ?)";