diff --git a/taglib/mpeg/id3v2/id3v2tag.cpp b/taglib/mpeg/id3v2/id3v2tag.cpp
index 156c6d5e..f80a1b1a 100644
--- a/taglib/mpeg/id3v2/id3v2tag.cpp
+++ b/taglib/mpeg/id3v2/id3v2tag.cpp
@@ -186,9 +186,13 @@ String ID3v2::Tag::genre() const
   // the behavior the same as released versions it is being left with " ".
 
   const FrameList &tconFrames = d->frameListMap["TCON"];
-  TextIdentificationFrame *f;
-  if(tconFrames.isEmpty() ||
-     !(f = dynamic_cast<TextIdentificationFrame *>(tconFrames.front())))
+  if(tconFrames.isEmpty())
+  {
+    return String();
+  }
+
+  TextIdentificationFrame *f = dynamic_cast<TextIdentificationFrame *>(tconFrames.front());
+  if(!f)
   {
     return String();
   }