More error handling
Include relationships in entity_serializer