Try and treat lone file upload conistantly with respect to sessions