Issue #128 - modify the check on empty input