FIX: [AE] if null sink is requested, return null sink
Merge pull request #4785 from koying/fixaenull

FIX: [AE] if null sink is requested, return null sink