1 files changed, 4 insertions, 8 deletions
diff --git a/juick-server/src/main/java/com/juick/server/SignatureManager.java b/juick-server/src/main/java/com/juick/server/SignatureManager.java
index d43efd4a..927a62a7 100644
--- a/juick-server/src/main/java/com/juick/server/SignatureManager.java
+++ b/juick-server/src/main/java/com/juick/server/SignatureManager.java
@@ -89,15 +89,11 @@ public class SignatureManager {
         return false;
     }
     public Optional<Context> getContext(URI contextUri) {
-        try {
-            return Optional.of(apClient.getForEntity(contextUri, Context.class).getBody());
-        } catch (HttpClientErrorException e) {
+        Context context = apClient.getForEntity(contextUri, Context.class).getBody();
+        if (context == null) {
             logger.warn("Cannot identify {}", contextUri);
-            if (e.getStatusCode().equals(HttpStatus.GONE)) {
-                logger.warn("Server report {} is gone, deleting", contextUri);
-                applicationEventPublisher.publishEvent(new DeleteUserEvent(this, contextUri.toASCIIString()));
-            }
+            return Optional.empty();
         }
-        return Optional.empty();
+        return Optional.of(context);
     }
 }