Add entity existence and validity checks