tweaks for changed usernames
added additional error handling