Better handling of incorrect decoding.