Fix the symptom

Test one layer before changing the next.

A structured check is faster than reinstalling every app or changing several settings at once.