Added additional check if options were provided in command handler.