Fixed bug from previous commit: expect empty string, not SCALAR