Made sure that roster get worked.
Corrections when encountering no information