VID-1281 Fix errors when there aren't colon separated options