diff --git a/TODO b/TODO
index c80372fc1..6d24fe69d 100644
--- a/TODO
+++ b/TODO
@@ -2,4 +2,5 @@ TODO list (for developers only):
 - timestamp management across database and packages servers
 - hash management (like Manifest in gentoo)
 - write rules for exit codes
+- store etpData['md5'] and use it to choose if there is the needing of a version bump of the .etp file
 - a lot more :-P
\ No newline at end of file
diff --git a/libraries/entropyTools.py b/libraries/entropyTools.py
index 42881e09c..65e86b8df 100644
--- a/libraries/entropyTools.py
+++ b/libraries/entropyTools.py
@@ -128,9 +128,12 @@ def extractPkgData(package):
     f.close()
 
     # Fill CFLAGS
-    f = open(tbz2TmpDir+dbCFLAGS,"r")
-    etpData['cflags'] = f.readline().strip()
-    f.close()
+    try:
+        f = open(tbz2TmpDir+dbCFLAGS,"r")
+        etpData['cflags'] = f.readline().strip()
+        f.close()
+    except IOError:
+        etpData['cflags'] = ""
 
     # Fill CXXFLAGS
     try:
@@ -204,9 +207,12 @@ def extractPkgData(package):
     etpData['useflags'] = removeSpaceAtTheEnd(etpData['useflags'])
 
     # fill KEYWORDS
-    f = open(tbz2TmpDir+dbKEYWORDS,"r")
-    etpData['keywords'] = f.readline().strip()
-    f.close()
+    try:
+        f = open(tbz2TmpDir+dbKEYWORDS,"r")
+        etpData['keywords'] = f.readline().strip()
+        f.close()
+    except IOError:
+	etpData['keywords'] = ""
 
     # fill ARCHs
     pkgArchs = etpData['keywords']