fix missing arguments on error-state reject
reformat for clarity, consistency
add cascading-catch tests