Proceed only if the database is found
Merge commit '6693a9e'