Added in nonetype post handling