diff --git a/src/main/java/edu/ntnu/idatt1002/k1g4/dao/TeamDAO.java b/src/main/java/edu/ntnu/idatt1002/k1g4/dao/TeamDAO.java
index 0fb2e169f3c277c0433e4bfb29c52abb294d4674..1331378955ff18252523877cc219b90e38ad388a 100644
--- a/src/main/java/edu/ntnu/idatt1002/k1g4/dao/TeamDAO.java
+++ b/src/main/java/edu/ntnu/idatt1002/k1g4/dao/TeamDAO.java
@@ -98,7 +98,15 @@ public class TeamDAO {
             preparedStatement = connection.prepareStatement(sql);
             preparedStatement.setString(1, name);
             resultSet = preparedStatement.executeQuery();
-            team = getTeamFromResultSet(resultSet);
+            try {
+                if (resultSet.next()) {
+                    team = new Team();
+                    team.setTeamId(resultSet.getInt("teamId"));
+                    team.setName(resultSet.getString("teamName"));
+                }
+            } catch (SQLException e) {
+                e.printStackTrace();
+            }
         } catch (SQLException e) {
             e.printStackTrace();
         } finally {
diff --git a/src/test/java/edu/ntnu/idatt1002/k1g4/TeamDAOTest.java b/src/test/java/edu/ntnu/idatt1002/k1g4/TeamDAOTest.java
index 8c201e02973272e6cbe5a57e32fb9491d830a899..24dffb29f9417c894395fcf67aecae26c7059935 100644
--- a/src/test/java/edu/ntnu/idatt1002/k1g4/TeamDAOTest.java
+++ b/src/test/java/edu/ntnu/idatt1002/k1g4/TeamDAOTest.java
@@ -39,7 +39,7 @@ public class TeamDAOTest {
 
     @Test
     public void testGetTeamByName() {
-        Team team = teamDAO.getTeamByName("Jims Warriors", 1);
+        Team team = teamDAO.getTeamByName("Jims Warriors");
         assertEquals("Jims Warriors", team.getName());
     }