diff --git a/java-std/{{cookiecutter.app_name}}/src/main/java/io/eigr/spawn/java/App.java b/java-std/{{cookiecutter.app_name}}/src/main/java/io/eigr/spawn/java/App.java
index ff7fe91..b4ba1a2 100644
--- a/java-std/{{cookiecutter.app_name}}/src/main/java/io/eigr/spawn/java/App.java
+++ b/java-std/{{cookiecutter.app_name}}/src/main/java/io/eigr/spawn/java/App.java
@@ -19,9 +19,8 @@ public final class App {
     public static void main(String[] args) throws SpawnException {
         Config cfg = Config.createDefaultConfig();
 
-        PostalCodeService postalCodeService = new PostalCodeService();
         DependencyInjector dependencyInjector = SimpleDependencyInjector.createInjector();
-        dependencyInjector.bind(PostalCodeService.class, postalCodeService);
+        dependencyInjector.bind(PostalCodeService.class, new PostalCodeService());
 
         Spawn spawnSystem = new Spawn.SpawnSystem()
                 .create(cfg.spawnSystemName, dependencyInjector)
diff --git a/java-std/{{cookiecutter.app_name}}/src/main/java/io/eigr/spawn/java/actors/PostalCodeActor.java b/java-std/{{cookiecutter.app_name}}/src/main/java/io/eigr/spawn/java/actors/PostalCodeActor.java
index 70cdba1..fad5c3f 100644
--- a/java-std/{{cookiecutter.app_name}}/src/main/java/io/eigr/spawn/java/actors/PostalCodeActor.java
+++ b/java-std/{{cookiecutter.app_name}}/src/main/java/io/eigr/spawn/java/actors/PostalCodeActor.java
@@ -37,13 +37,11 @@ private Value getPostalCodeData(ActorContext<Common.PostalCodeState> context, Co
         log.debug("Received invocation. Message: '{}'. Context: '{}'.", msg, context);
         Common.PostalCodeState.Builder builder = Common.PostalCodeState.newBuilder();
 
-        if (context.getState().isPresent()) {
-            Common.PostalCodeState state = context.getState().get();
-            log.trace("State is present and value is '{}'.", state);
+        if (context.getState().isPresent() && !Common.PostalCodeStatus.UNKNOWN.equals(state.getStatus())) 
             return Value.at()
-                    .state(state)
-                    .response(Common.GetResponse.newBuilder().setPostalCode(state).build())
-                    .reply();
+                .state(state)
+                .response(Common.GetResponse.newBuilder().setPostalCode(state).build())
+                .reply();
         }
 
         log.trace("State not present.");
@@ -75,3 +73,4 @@ private Value getPostalCodeData(ActorContext<Common.PostalCodeState> context, Co
                 .reply();
     }
 }
+