[new CA] gracefully handle invalid selections

Change-Id: I5d5c0e2dfcd93a4ea11036713e13fe2e2d5785b5
Merge "[new CA] gracefully handle invalid selections"