add stupid try/except as workaround before the split of auth