diff --git a/pisi/metadata.py b/pisi/metadata.py
index 2ac1ee81..0aef1ded 100644
--- a/pisi/metadata.py
+++ b/pisi/metadata.py
@@ -27,10 +27,10 @@ class SourceInfo:
         return node
 
     def verify(self):
-        ret = True
-        ret &= self.name
+        if not self.name: return False
         return True
 
+
 class PackageInfo(specfile.PackageInfo):
 
     def __init__(self, node=None):
@@ -50,9 +50,7 @@ class PackageInfo(specfile.PackageInfo):
         return node
 
     def verify(self):
-        ret = True
-        ret &= specfile.PackageInfo.verify()
-        return True
+        super(PackageInfo, self).verify()
 
 class MetaData(XmlFile):
     """Package metadata. Metadata is composed of Specfile and various
@@ -92,11 +90,9 @@ class MetaData(XmlFile):
         self.writexml(filename)
 
     def verify(self):
-        ret = True
-        ret &= hasattr(self, 'source')
-        if self.source:
-            ret &= self.source.verify()
-        ret &= self.package != None
-        if self.package:
-            ret &= self.package.verify()
+        if not hasattr(self, 'source'): return False
+        if not self.source.verify(): return False
+        
+        if not self.package: return False
+        if not self.package.verify(): return False
         return True
diff --git a/tests/metadatatests.py b/tests/metadatatests.py
index 4df64340..99356cd9 100644
--- a/tests/metadatatests.py
+++ b/tests/metadatatests.py
@@ -24,6 +24,11 @@ class MetaDataTestCase(unittest.TestCase):
     def testWrite(self):
         md = self.testRead()
         md.write(os.path.join(config.tmp_dir(),'metadata-test.xml' ))
-        
+
+    def testVerify(self):
+        md = self.testRead()
+        if not md.verify():
+            self.fail("Couldn't verify!")
+
 
 suite = unittest.makeSuite(MetaDataTestCase)
diff --git a/tests/sandbox/metadata.xml b/tests/sandbox/metadata.xml
index 1b88ae8c..5bac2067 100644
--- a/tests/sandbox/metadata.xml
+++ b/tests/sandbox/metadata.xml
@@ -4,6 +4,7 @@
 
   <Source>
   <Name>sandbox</Name>
+  <Summary>We should have something to say here.</Summary>
   <Packager>
     <Name>Meral</Name>
     <Email>meren@uludag.org.tr</Email>