Added temporary fix for checking of db existence before killing