Make session expiry uniform
Consolidate controller errors