CB-6303 Simplify error when user uses ^C at password prompt