diff --git a/app/Repositories/Main/DoctrineTagRepository.php b/app/Repositories/Main/DoctrineTagRepository.php
index 0d992e1b..5a358ae9 100644
--- a/app/Repositories/Main/DoctrineTagRepository.php
+++ b/app/Repositories/Main/DoctrineTagRepository.php
@@ -11,6 +11,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+
+use Doctrine\ORM\NoResultException;
 use models\main\ITagRepository;
 use models\main\Tag;
 use App\Repositories\SilverStripeDoctrineRepository;
@@ -40,8 +42,8 @@ final class DoctrineTagRepository
     protected function getOrderMappings()
     {
         return [
-            'id'   => 'e.id',
-            'tag'  => 'e.tag',
+            'id' => 'e.id',
+            'tag' => 'e.tag',
         ];
     }
 
@@ -57,9 +59,9 @@ final class DoctrineTagRepository
                 ->from(\models\main\Tag::class, "t")
                 ->where('UPPER(TRIM(t.tag)) = UPPER(TRIM(:tag))')
                 ->setParameter('tag', $tag)
-                ->getQuery()->getOneOrNullResult();
+                ->getQuery()->getSingleResult();
         }
-        catch(\Exception $ex){
+        catch(NoResultException $e){
             return null;
         }
     }
diff --git a/app/Services/Model/SummitTrackTagGroupService.php b/app/Services/Model/SummitTrackTagGroupService.php
index ca20fe28..4779ba4d 100644
--- a/app/Services/Model/SummitTrackTagGroupService.php
+++ b/app/Services/Model/SummitTrackTagGroupService.php
@@ -166,7 +166,8 @@ implements ISummitTrackTagGroupService
                 $track_tag_group->clearAllowedTags();
                 foreach ($data['allowed_tags'] as $str_tag) {
                     $tag = $this->tag_repository->getByTag($str_tag);
-                    if($tag == null) $tag = new Tag($str_tag);
+                    if(is_null($tag))
+                        $tag = new Tag(trim($str_tag));
                     $track_tag_group->addTag($tag);
                 }
             }
diff --git a/tests/OAuth2TrackTagGroupsApiTest.php b/tests/OAuth2TrackTagGroupsApiTest.php
index a0e26f76..b18edda9 100644
--- a/tests/OAuth2TrackTagGroupsApiTest.php
+++ b/tests/OAuth2TrackTagGroupsApiTest.php
@@ -88,11 +88,11 @@ final class OAuth2TrackTagGroupsApiTest extends ProtectedApiTest
      * @param int $summit_id
      * @return mixed
      */
-    public function testUpdateTrackTagGroup($summit_id = 25){
-        $new_track_tag_group = $this->testAddTrackTagGroup($summit_id);
+    public function testUpdateTrackTagGroup($summit_id = 27){
+        //$new_track_tag_group = $this->testAddTrackTagGroup($summit_id);
         $params = [
             'id' => $summit_id,
-            'track_tag_group_id' => $new_track_tag_group->id,
+            'track_tag_group_id' => 26,
             'expand' => 'allowed_tags,tag'
         ];