Issue #128 - re-modify the check on empty input