fixed some null pointers in marketplace