Merge "Clean up error handling in custom sqlite function dispatching"