SafeDatabaseStop added