Better Checking to avoid pre-sesion bug