Make shib login case more robust

Handle shib failure case to remove redirect loop
Lessen confusing messaging