diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 1ab4e40cb..86b4b8b5e 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -55,22 +55,31 @@ def register_changeset(struct, params \\ %{}) do
 
   def follow(%User{} = follower, %User{} = followed) do
     ap_followers = User.ap_followers(followed)
-    following = [ap_followers | follower.following]
-    |> Enum.uniq
+    if following?(follower, followed) do
+      { :error,
+        "Could not follow user: #{followed.nickname} is already on your list." }
+    else
+      following = [ap_followers | follower.following]
+      |> Enum.uniq
 
-    follower
-    |> follow_changeset(%{following: following})
-    |> Repo.update
+      follower
+      |> follow_changeset(%{following: following})
+      |> Repo.update
+    end
   end
 
   def unfollow(%User{} = follower, %User{} = followed) do
     ap_followers = User.ap_followers(followed)
-    following = follower.following
-    |> List.delete(ap_followers)
+    if following?(follower, followed) do
+      following = follower.following
+      |> List.delete(ap_followers)
 
-    follower
-    |> follow_changeset(%{following: following})
-    |> Repo.update
+      follower
+      |> follow_changeset(%{following: following})
+      |> Repo.update
+    else
+      { :error, "Not subscribed!" }
+    end
   end
 
   def following?(%User{} = follower, %User{} = followed) do
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 735d88832..7984b2e63 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -105,7 +105,7 @@ def fetch_status(user, id) do
 
   def follow(%User{} = follower, followed_id) do
     with %User{} = followed <- Repo.get(User, followed_id),
-         { :ok, follower } <- User.follow(follower, followed),
+    { :ok, follower } <- User.follow(follower, followed),
          { :ok, activity } <- ActivityPub.insert(%{
            "type" => "Follow",
            "actor" => follower.ap_id,
@@ -114,6 +114,8 @@ def follow(%User{} = follower, followed_id) do
          })
     do
       { :ok, follower, followed, activity }
+    else
+      err -> err
     end
   end
 
@@ -122,6 +124,8 @@ def unfollow(%User{} = follower, followed_id) do
          { :ok, follower } <- User.unfollow(follower, followed)
     do
       { :ok, follower, followed }
+    else
+      err -> err
     end
   end
 
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 6014aedc4..32d352d79 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -46,21 +46,24 @@ def friends_timeline(%{assigns: %{user: user}} = conn, params) do
   end
 
   def follow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
-    { :ok, user, follower, _activity } = TwitterAPI.follow(user, followed_id)
-
-    response = follower |> UserRepresenter.to_json(%{for: user})
-
-    conn
-    |> json_reply(200, response)
+    case TwitterAPI.follow(user, followed_id) do
+      { :ok, user, followed, _activity } ->
+        response = followed |> UserRepresenter.to_json(%{for: user})
+        conn
+        |> json_reply(200, response)
+      { :error, msg } -> forbidden_json_reply(conn, msg)
+    end
   end
 
   def unfollow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
-    { :ok, user, follower } = TwitterAPI.unfollow(user, followed_id)
+    case TwitterAPI.unfollow(user, followed_id) do
+      { :ok, user, followed } ->
+        response = followed |> UserRepresenter.to_json(%{for: user})
 
-    response = follower |> UserRepresenter.to_json(%{for: user})
-
-    conn
-    |> json_reply(200, response)
+        conn
+        |> json_reply(200, response)
+      { :error, msg } -> forbidden_json_reply(conn, msg)
+    end
   end
 
   def fetch_status(%{assigns: %{user: user}} = conn, %{ "id" => id }) do
@@ -164,4 +167,11 @@ defp json_reply(conn, status, json) do
     |> put_resp_content_type("application/json")
     |> send_resp(status, json)
   end
+
+  defp forbidden_json_reply(conn, error_message) do
+    json = %{"error" => error_message, "request" => conn.request_path}
+    |> Poison.encode!
+
+    json_reply(conn, 403, json)
+  end
 end
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index 8b15b0ed4..48a2c3ba0 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -114,26 +114,31 @@ test "fetch a single status" do
 
   test "Follow another user" do
     user = insert(:user)
-    following = insert(:user)
+    followed = insert(:user)
 
-    {:ok, user, following, activity } = TwitterAPI.follow(user, following.id)
+    { :ok, user, followed, activity } = TwitterAPI.follow(user, followed.id)
 
     user = Repo.get(User, user.id)
     follow = Repo.get(Activity, activity.id)
 
-    assert user.following == [User.ap_followers(following)]
+    assert user.following == [User.ap_followers(followed)]
     assert follow == activity
+
+    { :error, msg } = TwitterAPI.follow(user, followed.id)
+    assert msg == "Could not follow user: #{followed.nickname} is already on your list."
   end
 
   test "Unfollow another user" do
-    following = insert(:user)
-    user = insert(:user, %{following: [User.ap_followers(following)]})
+    followed = insert(:user)
+    user = insert(:user, %{following: [User.ap_followers(followed)]})
 
-    {:ok, user, _following } = TwitterAPI.unfollow(user, following.id)
+    { :ok, user, _followed } = TwitterAPI.unfollow(user, followed.id)
 
     user = Repo.get(User, user.id)
 
     assert user.following == []
+    { :error, msg } = TwitterAPI.unfollow(user, followed.id)
+    assert msg == "Not subscribed!"
   end
 
   test "fetch statuses in a context using the conversation id" do