Added in decodeSafely