Resolved error for missing case in isExpired previously. Committing
again