Fixed segfault unsupported encodings
Merge branch 'diadistis-master'