diff --git a/moco-core/src/main/java/com/github/dreamhead/moco/extractor/FormRequestExtractor.java b/moco-core/src/main/java/com/github/dreamhead/moco/extractor/FormRequestExtractor.java
index <HASH>..<HASH> 100644
--- a/moco-core/src/main/java/com/github/dreamhead/moco/extractor/FormRequestExtractor.java
+++ b/moco-core/src/main/java/com/github/dreamhead/moco/extractor/FormRequestExtractor.java
@@ -6,8 +6,6 @@ import com.google.common.collect.ImmutableMap;
 
 import java.util.Optional;
 
-import static java.util.Optional.empty;
-
 public final class FormRequestExtractor extends HttpRequestExtractor<String> {
     private final FormsRequestExtractor extractor = new FormsRequestExtractor();
     private final String key;
@@ -19,10 +17,6 @@ public final class FormRequestExtractor extends HttpRequestExtractor<String> {
     @Override
     protected Optional<String> doExtract(final HttpRequest request) {
         Optional<ImmutableMap<String, String>> forms = extractor.extract(request);
-        if (forms.isPresent()) {
-            return Optional.ofNullable(forms.get().get(key));
-        }
-
-        return empty();
+        return forms.map(formValues -> formValues.get(key));
     }
 }
applied optional map in form request extractor