Merge branch 'jc/parseopt-expiry-errors'