[OTFC] moar error handling and moar test cases.