Add try/except checks for non-existent usernames and whitespace cleanup
fixed merge conflict