Additional protections for #557.
Merge pull request #864 from Digipom/issue_557

Additional protections for #557.