Added empty argument check