Workaround for database exception

Need to find root cause