Re-add patch to not deref null descriptor pointer when fetching grant ref