whitespace cleanup
Use a better error message if we find a non-existing session