Improve error handling in high-level BAPS code.
Make just about everything peachy, hopefully.