Improve error generation and text, simplify the SPADB#_update function