JSCBC-132: Fixed incorrect expiry option validation.

Change-Id: I83e6583d69e63d301404b6e6fbbd83bc81db59d9