Improve: empty strings may be interpreted as NULL