Fix crasher introduced by last-minute untested edit of 7be7bdff

* The failing selser tests are separator related and will be fixed
  by upcoming separator handling patch.

Change-Id: I5f189d4bb85ffbea2c287bebf6dd75f485b0a4eb