This is the extra check - note the TODO comment - I will remove that once we start using db sessions.