Added few lines to ensure that newly signed up users don't see errors