Fixed a nil error in some cases in the last commit.  Part of #727. Part of #458.
Fixed a nil error in some cases in the last commit.  Part of #727. Part of #458.

jkomoros/boardgame,jkomoros/boardgame,jkomoros/boardgame