- Added a fallback to a json serializer to prevent errors