Added check for no arguments