FB fixes + added catching of auth errors