Update to check empty string since vars.expand() doesn't return null