More exceptions
Add credential options