Tom Whalley to handle Tupac's catalog after Afeni's death

[CORREA]

Tupac's mother guarded his music and financial legacy in life, and TMZ has learned Afeni Shakur took extraordinary steps to do the same in death.

Afeni had set up a trust to control all of Tupac's music rights, and a rep for his estate tells us the paperwork is flawless. She also named the perfect executor, Tom Whalley -- former head of Warner Bros. Records -- to handle Tupac's valuable catalog.

We're told the trust is very specific about heirs, and the money is going to select charities and family. Afeni is survived by her sister, Gloria, and a daughter, Sekyiwa Shakur ... Tupac's half sister.

Her estranged husband, Gust Davis, is not mentioned in the trust -- so Tupac's money and music will be virtually untouchable in that divorce.

Interestingly, Tupac's mother was repped by attorney Howard King, who also worked with Prince years ago. He says Prince hated dealing with paperwork and rarely listened to advisors, but Afeni was the exact opposite -- which is why there shouldn't be any legal battles over Tupac's fortune.

[CORREA]

as long as that fat piece of shit ed doesn't get it im all in 

[TraceOneInfinite Flat Earther 96']

This is good news.  Sounds like they already had a clear plan in place.