Issue #128 - adding checks on Empty input