Issue #172: Adding master failsafe.