checkpoint
Restructure error reporting