Version 1.09.9: Fixed rare NPE