diff --git a/pisi/metadata.py b/pisi/metadata.py
index 561f30d6..2ac1ee81 100644
--- a/pisi/metadata.py
+++ b/pisi/metadata.py
@@ -93,10 +93,10 @@ class MetaData(XmlFile):
 
     def verify(self):
         ret = True
-        ret &= self.source
+        ret &= hasattr(self, 'source')
         if self.source:
             ret &= self.source.verify()
-        ret &= self.package
+        ret &= self.package != None
         if self.package:
             ret &= self.package.verify()
         return True
diff --git a/pisi/specfile.py b/pisi/specfile.py
index be85dc30..41982fa9 100644
--- a/pisi/specfile.py
+++ b/pisi/specfile.py
@@ -130,13 +130,13 @@ class SourceInfo:
 
     def verify(self):
         ret = True
-        ret &= self.name
-        ret &= self.summary
-        ret &= self.description
+        ret &= self.name != None
+        ret &= self.summary != None
+        ret &= self.description != none
         ret &= len(self.history) > 0
         return ret
 
-class PackageInfo:
+class PackageInfo(object):
     """A structure to hold package information. Package information is
     located under <Package> tag in PSPEC file. Opposite to Source each
     PSPEC file can have more than one Package tag."""