#069: Protective measures

#069: Protective measures