Added options for empty/wrong arguments