Fixes null reference bug. Variable was not initialized.
Also rearranged variable declaration to be more uniform.
Merge remote-tracking branch 'remotes/bolwire/NCGridFix'
Merge branch 'master' into PerformanceWork