Nicer message for missing credentials and fix for some clashing variables.