Plugin fixes for unset return variable cases