added extra checking for strict databases