Fix for decoding crash seen in whatson.