plugin fixes for unset return variable cases