Performance improvement, inline broken-ness checks