Fix token expiry check. Add missing returns to Parse()