DATAES-117 - Displaying proper error message for entities that don't have an Id
DATAES-46 - Apply code formatting