Check for token type instead of handling an exception
Refactor album page response token parsing

plus changed the rank property to be a nullable int
Fix conflicts with ceb16a9