Fix NumberFormatException killing cli bug