Reviewed-by: sla, ctornqvi, lfoltan, mchung, alanb
Catch problem case, assert it matches valid input, new test Reviewed-by: jrose, twisti, kvn