No database result handling fixes