added protection against filler errors and fixed array out of bounds for cylinder, fix #1604