diff --git a/IM/InfrastructureList.py b/IM/InfrastructureList.py
index aa4e675f9..31e1de4b1 100644
--- a/IM/InfrastructureList.py
+++ b/IM/InfrastructureList.py
@@ -205,7 +205,10 @@ def _get_data_from_db(db_url, inf_id=None, auth=None):
                             InfrastructureList.logger.exception(
                                 "ERROR reading infrastructure from database, ignoring it!.")
                 else:
-                    InfrastructureList.logger.warn("No data in database!.")
+                    msg = ""
+                    if inf_id:
+                        msg = " for inf ID: %s" % inf_id
+                    InfrastructureList.logger.warn("No data in database%s!." % msg)
 
                 db.close()
                 return inf_list