Add some helpful logging, fix an issue with string.empty