PER-107: fixed fatal errors