DB/SAI: Fix Catch and Release

By Polkic, closes #11236