Attempts to fix #100, #128, and maybe other duplicates

Added handling for a "possible authentication failure" which is apparently the best we can do.