NoSuchOptError should be used not AttributeError

Switch back to previous behavior. Looks like we are missing a test to
enforce the old behavior that everyone depends on

Fixes LP# 1207541

Change-Id: I79c58cfcf619a461f6a42a4dccfa9141bc1033a0