Employ defensive programming in new Adjacency
Revert "MAA Fixes"

This reverts commit 78242647170c034e5df87a18bf8e5cf3186ec822.