better error handling
Merge branch 'doc_status' into testing