database name should be checked before attempting to get the database handler

[khaled mohamed]

In many places, I have noticed that it has been attempting to get the database handler from a dict without checking if the dict key has the provided database name, this check needs to be added