Emergency fix 88

Fixes one of the Nil errors, but not the actual issue.  I could see the edit specialists page after running this.

The rest of the code changes were for cleaning up the outer shadow variables.