diff --git a/libraries/databaseTools.py b/libraries/databaseTools.py
index 097667f8f..cf824d199 100644
--- a/libraries/databaseTools.py
+++ b/libraries/databaseTools.py
@@ -3450,27 +3450,27 @@ class etpDatabase(TextInterface):
         self.createExtrainfoIndex()
 
     def createContentIndex(self):
-        self.checkReadOnly()
         if self.dbname != "etpdb" and self.indexing:
+            self.checkReadOnly()
             self.cursor.execute('CREATE INDEX IF NOT EXISTS contentindex ON content ( file )')
             self.commitChanges()
 
     def createBaseinfoIndex(self):
-        self.checkReadOnly()
         if self.dbname != "etpdb" and self.indexing:
+            self.checkReadOnly()
             self.cursor.execute('CREATE INDEX IF NOT EXISTS baseindex ON baseinfo ( idpackage, atom, name, version, slot, branch, revision )')
             self.commitChanges()
 
     def createDependenciesIndex(self):
-        self.checkReadOnly()
         if self.dbname != "etpdb" and self.indexing:
+            self.checkReadOnly()
             self.cursor.execute('CREATE INDEX IF NOT EXISTS dependenciesindex ON dependencies ( idpackage, iddependency )')
             self.cursor.execute('CREATE INDEX IF NOT EXISTS dependenciesreferenceindex ON dependenciesreference ( iddependency, dependency )')
             self.commitChanges()
 
     def createExtrainfoIndex(self):
-        self.checkReadOnly()
         if self.dbname != "etpdb" and self.indexing:
+            self.checkReadOnly()
             self.cursor.execute('CREATE INDEX IF NOT EXISTS extrainfoindex ON extrainfo ( idpackage, description, homepage, download, digest, datecreation, size )')
             self.commitChanges()
 
diff --git a/libraries/reagentTools.py b/libraries/reagentTools.py
index 4b846986d..d09f69949 100644
--- a/libraries/reagentTools.py
+++ b/libraries/reagentTools.py
@@ -547,14 +547,11 @@ def database(options):
 
             for result in results:
                 foundCounter += 1
-                print
                 printPackageInfo(result[1],dbconn, clientSearch = True, extended = True, EquoConnection = Entropy)
 
         dbconn.closeDB()
         if (foundCounter == 0):
             print_warning(red(" * ")+red("Nothing found."))
-        else:
-            print
         return 0
 
     elif (options[0] == "create-empty-database"):