Fix bug in expression mapping - check for "" string, not just None.