First attempt to squash session errors