don't crash when user has no expiration date
Merge branch 'hotfix/1.1.2'
Merge tag '1.1.2' into develop

1.1.2