Safety Net and Safety Blanket

Issue #543