Fixed crash on no expiration date
Merge remote-tracking branch 'origin/master'