Some provider fail safes and new logo test