Fix null pointer and change option delimiters