Now with more error control!