Made some changes to make errors check better and to handle null values better.

* Fixed bug with filtering/setting by/to "Still Together".