Change: Handle more fb error cases