Non-crashing Serialize of Q/A shizzle

Yar har har
After merge with master