Merge "Fix for potential NULL de-reference issue in Reverb"