Fix null dash error. (#107, #114, #138)