Fixed travis failures

Flak8 and when no user existed failure fixed. 
Why do we need a return if we're raising? Also, did you go through all the places that call this function to see if they don't expect None?