diff --git a/src/main/java/org/ntlab/nemophila/resources/shops/ShopRest.java b/src/main/java/org/ntlab/nemophila/resources/shops/ShopRest.java
index 538bd22..03b0f24 100644
--- a/src/main/java/org/ntlab/nemophila/resources/shops/ShopRest.java
+++ b/src/main/java/org/ntlab/nemophila/resources/shops/ShopRest.java
@@ -1,11 +1,13 @@
 package org.ntlab.nemophila.resources.shops;
 
+import org.ntlab.nemophila.models.accounts.Post;
 import org.ntlab.nemophila.models.shops.Shop;
 import org.ntlab.nemophila.models.shops.ShopManager;
 import org.springframework.stereotype.Component;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
 import java.util.Collection;
 
 @Component
@@ -15,12 +17,14 @@
     @GET
     @Path("/{sid}")
     @Produces(MediaType.APPLICATION_JSON)
-    public String getID(@PathParam("sid") String sid) {
+    public Shop getShop(@PathParam("sid") String sid) {
         ShopManager sm = ShopManager.getInstance();
         Shop shop = sm.getShop(sid);
 
+        if (shop != null) {
+            return shop;
+        }
+
         return null;
     }
-
-
 }
\ No newline at end of file