Consider case when parameter input is empty
Previous fix revealed significant error