Added checks to exist database client and scenario