Added checking for optional service plan fields before unboxing. Removed tests for optional service plan fields.
Merge pull request #167 from scottfrederick/service-plans

Added checking for optional service plan fields before unboxing.