Moved getGrid() (WeakReference) to a local var
Prevent anything but boosters inside WAPs
Merge pull request #372 from yueh/fix-366

Prevent anything but boosters inside WAPs
Merge pull request #373 from yueh/fix-326

Moved getGrid() (WeakReference) to a local var