From f3e3671a3c24451acfdc6f6ddc261a2bc0e81b16 Mon Sep 17 00:00:00 2001
From: mrward <ward.matt@gmail.com>
Date: Wed, 16 Mar 2011 17:43:23 +0000
Subject: [PATCH] Handle exceptions when installing and uninstalling NuGet
 packages.

---
 .../Project/PackageManagement.csproj          |   2 +
 .../Project/Resources/exclamation.png         | Bin 0 -> 701 bytes
 .../Project/Src/AddPackageReferenceView.xaml  |  31 ++++-
 .../Src/AddPackageReferenceViewModel.cs       |  40 ++++++-
 .../Project/Src/AvailablePackagesViewModel.cs |   3 +-
 .../Src/Design/DesignTimePackagesViewModel.cs |   2 +-
 ...FakePackageManagementOutputMessagesView.cs |   4 +
 .../Design/FakePackageManagementService.cs    |  19 +---
 .../Project/Src/IMessageReporter.cs           |  13 +++
 .../Project/Src/InstalledPackagesViewModel.cs |   3 +-
 .../Project/Src/PackageUpdatesViewModel.cs    |   3 +-
 .../Project/Src/PackageViewModel.cs           |  47 +++++++-
 .../Project/Src/PackageViewModelFactory.cs    |  13 +--
 .../Project/Src/PackagesViewModel.cs          |   9 +-
 .../Project/Src/RecentPackagesViewModel.cs    |   7 +-
 .../Test/PackageManagement.Tests.csproj       |   3 +
 .../Src/AddPackageReferenceViewModelTests.cs  | 103 +++++++++++++++++
 .../Src/AvailablePackagesViewModelTests.cs    |   3 +-
 ...ceptionThrowingPackageManagementService.cs |  36 ++++++
 ...ceptionThrowingPackageOperationResolver.cs |  19 ++++
 .../Test/Src/Helpers/FakeMessageReporter.cs   |  24 ++++
 .../Helpers/FakePackageOperationResolver.cs   |   2 +-
 .../Src/Helpers/TestablePackageViewModel.cs   |  17 ++-
 .../Src/Helpers/TestablePackagesViewModel.cs  |   2 +-
 .../Src/InstalledPackagesViewModelTests.cs    |  27 +++--
 .../Test/Src/PackageUpdatesViewModelTests.cs  |   3 +-
 .../Test/Src/PackageViewModelTests.cs         | 107 +++++++++++++++++-
 .../Test/Src/RecentPackagesViewModelTests.cs  |   3 +-
 28 files changed, 472 insertions(+), 73 deletions(-)
 create mode 100644 src/AddIns/Misc/PackageManagement/Project/Resources/exclamation.png
 create mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/IMessageReporter.cs
 create mode 100644 src/AddIns/Misc/PackageManagement/Test/Src/Helpers/ExceptionThrowingPackageManagementService.cs
 create mode 100644 src/AddIns/Misc/PackageManagement/Test/Src/Helpers/ExceptionThrowingPackageOperationResolver.cs
 create mode 100644 src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakeMessageReporter.cs

diff --git a/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj b/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj
index b8f8353ecf..cee05593ff 100644
--- a/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj
+++ b/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj
@@ -85,6 +85,7 @@
     <Compile Include="Src\Design\FakeProjectSystem.cs" />
     <Compile Include="Src\Design\WpfDesigner.cs" />
     <Compile Include="Src\ICompilerMessageView.cs" />
+    <Compile Include="Src\IMessageReporter.cs" />
     <Compile Include="Src\IMessageViewCategory.cs" />
     <Compile Include="Src\IPackageManagementOutputMessagesView.cs" />
     <Compile Include="Src\IPackageRepositoryCache.cs" />
@@ -198,6 +199,7 @@
     <Resource Include="Resources\resultset_next.png" />
     <Resource Include="Resources\resultset_previous.png" />
     <Resource Include="Resources\accept.png" />
+    <Resource Include="Resources\exclamation.png" />
     <None Include="Resources\license.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
diff --git a/src/AddIns/Misc/PackageManagement/Project/Resources/exclamation.png b/src/AddIns/Misc/PackageManagement/Project/Resources/exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..c37bd062e60c3b38fc82e4d1f236a8ac2fae9d8c
GIT binary patch
literal 701
zcmV;u0z&<XP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!Pf0{UR5;6}
zlgmq#VHCz6ztjnp=~F?R5pQFPl&gp~;l?gdL<B>N#0$9Ug7g<e5Ea#;%|NSKc)@5f
z;7$;Xq9UY)Lyb<UqnJ8&8J!fJX6Aj*^R}?Q8M8KZcJJYw-+2!2dGd@g_@BuCJt4QR
zG|-rKLw1p@BngtANcK}WWZ&tJ=GN!sDp0pB`wdNCE3eQ~*sve@ZufS6V;#vz1Xgl=
zg_Pck`%i+q0GXSY{D$mHSJV_2H8nzF3t(&k0AP7)V0mk?F%>~-`rQ^qx~m@y2OU8A
z#zh~=7n#Z$Z*fx-GOtDf07cgx0suCz_W(2~Y(0tf@FX@P6EPuM_dgn$vj9LucO)%W
zw%HgMW>=#oL>nZ>M&NEf08>)#)k<{$fCT_r>rPi=BV=hFh6WS^qqze>C6Ek}o{M5%
za|@JGow<Oj0^5dOoQKhLCOSWpAw+HGQ?pSN*k#a4S7iZ8!-#Pje@#@=;p__PCqxJc
zp|wJe0=1luufg)vI#NXu-(QYlbNI0{or=h>u0t{&hgNzySHZxy@LTNh);YzZ2zSp_
zl$^T&Dnc|NLb&RD_!4>pt@VHdP)ZGER%5ZmWEe$lryR&y;2u^3cOkO<wojkI*Ki1l
z#hIAadT_@fO?4jgQ>4#6c%-<rxdo~DIizNzFvh@D?}Mw}hj=)IkFQ6!NOre9eIML)
z%AxZ|{Xz!zmU%tpEr;N;OJNL<O041Y#5fX5vnwQfk3ahm{G%5DVEpXi29oU*c9F8v
jOytms=QDpd)4#+ImC>(EY6a{600000NkvXXu0mjfxS2AI

literal 0
HcmV?d00001

diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/AddPackageReferenceView.xaml b/src/AddIns/Misc/PackageManagement/Project/Src/AddPackageReferenceView.xaml
index 0589b38075..aa291e9ae1 100644
--- a/src/AddIns/Misc/PackageManagement/Project/Src/AddPackageReferenceView.xaml
+++ b/src/AddIns/Misc/PackageManagement/Project/Src/AddPackageReferenceView.xaml
@@ -15,6 +15,10 @@
 	<Window.Resources>
 		<Style TargetType="Button" BasedOn="{x:Static core:GlobalStyles.ButtonStyle}"/>
 		<pm:ViewModelLocator x:Key="ViewModelLocator"/>
+		<BooleanToVisibilityConverter x:Key="BoolToVisibility"/>
+		
+		<BitmapImage x:Key="ErrorIcon"
+			UriSource="pack://application:,,,/PackageManagement;component/Resources/exclamation.png"/>
     </Window.Resources>
 	
 	<DockPanel>
@@ -23,15 +27,30 @@
 		<DockPanel.DataContext>
 			<Binding Source="{StaticResource ViewModelLocator}" Path="AddPackageReferenceViewModel"/>
 		</DockPanel.DataContext>
-		<StackPanel
+		<Grid
 			DockPanel.Dock="Bottom"
-			Margin="4, 4"
-			HorizontalAlignment="Right">
+			Margin="4, 4">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="Auto"/>
+				<ColumnDefinition Width="*"/>
+				<ColumnDefinition Width="Auto"/>
+			</Grid.ColumnDefinitions>
+			<StackPanel>
+				<Image
+					Margin="4, 4"
+					Visibility="{Binding Path=HasError, Converter={StaticResource BoolToVisibility}}"
+					Source="{StaticResource ErrorIcon}"/>
+			</StackPanel>
+			<TextBlock
+				Grid.Column="1"
+				Margin="4, 4"
+				TextTrimming="CharacterEllipsis"
+				Text="{Binding Path=Message}"/>
 			<Button
+				Grid.Column="2"
 				Content="{core:Localize Global.CloseButtonText}"
-				IsCancel="True">
-			</Button>
-		</StackPanel>
+				IsCancel="True"/>
+		</Grid>
 		<TabControl>
 			<TabItem Header="Available">
 				<pm:PackagesView
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/AddPackageReferenceViewModel.cs b/src/AddIns/Misc/PackageManagement/Project/Src/AddPackageReferenceViewModel.cs
index 0cb3dc2053..7c327969fc 100644
--- a/src/AddIns/Misc/PackageManagement/Project/Src/AddPackageReferenceViewModel.cs
+++ b/src/AddIns/Misc/PackageManagement/Project/Src/AddPackageReferenceViewModel.cs
@@ -8,13 +8,15 @@ using NuGet;
 
 namespace ICSharpCode.PackageManagement
 {
-	public class AddPackageReferenceViewModel : ViewModelBase<AddPackageReferenceViewModel>
+	public class AddPackageReferenceViewModel : ViewModelBase<AddPackageReferenceViewModel>, IMessageReporter
 	{
 		IPackageManagementService packageManagementService;
 		InstalledPackagesViewModel installedPackagesViewModel;
 		AvailablePackagesViewModel availablePackagesViewModel;
 		PackageUpdatesViewModel packageUpdatesViewModel;
 		RecentPackagesViewModel recentPackagesViewModel;
+		string message;
+		bool hasError;
 		
 		public AddPackageReferenceViewModel(
 			IPackageManagementService packageManagementService,
@@ -23,10 +25,10 @@ namespace ICSharpCode.PackageManagement
 			this.packageManagementService = packageManagementService;
 			this.packageManagementService.OutputMessagesView.Clear();
 			
-			availablePackagesViewModel = new AvailablePackagesViewModel(packageManagementService, taskFactory);
-			installedPackagesViewModel = new InstalledPackagesViewModel(packageManagementService, taskFactory);
-			packageUpdatesViewModel = new PackageUpdatesViewModel(packageManagementService, taskFactory);
-			recentPackagesViewModel = new RecentPackagesViewModel(packageManagementService, taskFactory);
+			availablePackagesViewModel = new AvailablePackagesViewModel(packageManagementService, this, taskFactory);
+			installedPackagesViewModel = new InstalledPackagesViewModel(packageManagementService, this, taskFactory);
+			packageUpdatesViewModel = new PackageUpdatesViewModel(packageManagementService, this, taskFactory);
+			recentPackagesViewModel = new RecentPackagesViewModel(packageManagementService, this, taskFactory);
 			
 			availablePackagesViewModel.ReadPackages();
 			installedPackagesViewModel.ReadPackages();
@@ -49,5 +51,33 @@ namespace ICSharpCode.PackageManagement
 		public RecentPackagesViewModel RecentPackagesViewModel {
 			get { return recentPackagesViewModel; }
 		}
+		
+		public void ShowErrorMessage(string message)
+		{
+			this.Message = message;
+			this.HasError = true;
+		}
+		
+		public string Message {
+			get { return message; }
+			set {
+				message = value;
+				OnPropertyChanged(model => model.Message);
+			}
+		}
+		
+		public bool HasError {
+			get { return hasError; }
+			set {
+				hasError = value;
+				OnPropertyChanged(model => model.HasError);
+			}
+		}
+		
+		public void ClearMessage()
+		{
+			this.Message = null;
+			this.HasError = false;
+		}
 	}
 }
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/AvailablePackagesViewModel.cs b/src/AddIns/Misc/PackageManagement/Project/Src/AvailablePackagesViewModel.cs
index cb59d8abf5..e0cbcbbdef 100644
--- a/src/AddIns/Misc/PackageManagement/Project/Src/AvailablePackagesViewModel.cs
+++ b/src/AddIns/Misc/PackageManagement/Project/Src/AvailablePackagesViewModel.cs
@@ -15,8 +15,9 @@ namespace ICSharpCode.PackageManagement
 		
 		public AvailablePackagesViewModel(
 			IPackageManagementService packageManagementService,
+			IMessageReporter messageReporter,
 			ITaskFactory taskFactory)
-			: base(packageManagementService, taskFactory)
+			: base(packageManagementService, messageReporter, taskFactory)
 		{
 			IsSearchable = true;
 			ShowPackageSources = packageManagementService.HasMultiplePackageSources;
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Design/DesignTimePackagesViewModel.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Design/DesignTimePackagesViewModel.cs
index 8b04991fa0..b840d29f16 100644
--- a/src/AddIns/Misc/PackageManagement/Project/Src/Design/DesignTimePackagesViewModel.cs
+++ b/src/AddIns/Misc/PackageManagement/Project/Src/Design/DesignTimePackagesViewModel.cs
@@ -11,7 +11,7 @@ namespace ICSharpCode.PackageManagement.Design
 	public class DesignTimePackagesViewModel : PackagesViewModel
 	{
 		public DesignTimePackagesViewModel()
-			: base(new DesignTimePackageManagementService(), new PackageManagementTaskFactory())
+			: base(new DesignTimePackageManagementService(), (IMessageReporter)null, new PackageManagementTaskFactory())
 		{
 			PageSize = 3;
 			AddPackageViewModels();
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementOutputMessagesView.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementOutputMessagesView.cs
index c1301667c1..0b66dfa8da 100644
--- a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementOutputMessagesView.cs
+++ b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementOutputMessagesView.cs
@@ -31,6 +31,10 @@ namespace ICSharpCode.PackageManagement.Design
 			}
 		}
 		
+		public string SecondFormattedMessageLogged {
+			get { return FormattedMessagesLogged[1]; }
+		}
+		
 		public void Clear()
 		{
 			IsClearCalled = true;
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementService.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementService.cs
index 888c2cf1b6..d7c8e00170 100644
--- a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementService.cs
+++ b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementService.cs
@@ -55,16 +55,11 @@ namespace ICSharpCode.PackageManagement.Design
 		
 		public IPackageRepository ActivePackageRepository { get; set; }
 		
-		public IProjectManager ActiveProjectManager {
-			get {
-				if (ActiveProjectManagerExeptionToThrow != null) {
-					throw ActiveProjectManagerExeptionToThrow;
-				}
-				return FakeActiveProjectManager;
-			}
+		public virtual IProjectManager ActiveProjectManager {
+			get { return FakeActiveProjectManager; }
 		}
 		
-		public void InstallPackage(IPackageRepository repository, IPackage package, IEnumerable<PackageOperation> operations)
+		public virtual void InstallPackage(IPackageRepository repository, IPackage package, IEnumerable<PackageOperation> operations)
 		{
 			IsInstallPackageCalled = true;
 			RepositoryPassedToInstallPackage = repository;
@@ -72,7 +67,7 @@ namespace ICSharpCode.PackageManagement.Design
 			PackageOperationsPassedToInstallPackage.AddRange(operations);
 		}
 		
-		public void UninstallPackage(IPackageRepository repository, IPackage package)
+		public virtual void UninstallPackage(IPackageRepository repository, IPackage package)
 		{
 			RepositoryPassedToUninstallPackage = repository;
 			PackagePassedToUninstallPackage = package;
@@ -112,9 +107,7 @@ namespace ICSharpCode.PackageManagement.Design
 		
 		public void AddPackageSources(IEnumerable<PackageSource> sources)
 		{
-			foreach (PackageSource source in sources) {
-				options.PackageSources.Add(source);
-			}
+			options.PackageSources.AddRange(sources);
 		}
 		
 		public PackageSource ActivePackageSource { get; set; }
@@ -126,8 +119,6 @@ namespace ICSharpCode.PackageManagement.Design
 			return FakeAggregateRepository;
 		}
 		
-		public Exception ActiveProjectManagerExeptionToThrow { get; set; }
-		
 		public FakePackageManagementOutputMessagesView FakeOutputMessagesView = new FakePackageManagementOutputMessagesView();
 		
 		public IPackageManagementOutputMessagesView OutputMessagesView {
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/IMessageReporter.cs b/src/AddIns/Misc/PackageManagement/Project/Src/IMessageReporter.cs
new file mode 100644
index 0000000000..586013b4b3
--- /dev/null
+++ b/src/AddIns/Misc/PackageManagement/Project/Src/IMessageReporter.cs
@@ -0,0 +1,13 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+
+namespace ICSharpCode.PackageManagement
+{
+	public interface IMessageReporter
+	{
+		void ShowErrorMessage(string message);
+		void ClearMessage();
+	}
+}
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/InstalledPackagesViewModel.cs b/src/AddIns/Misc/PackageManagement/Project/Src/InstalledPackagesViewModel.cs
index 5d997ad44a..52d08d9406 100644
--- a/src/AddIns/Misc/PackageManagement/Project/Src/InstalledPackagesViewModel.cs
+++ b/src/AddIns/Misc/PackageManagement/Project/Src/InstalledPackagesViewModel.cs
@@ -16,8 +16,9 @@ namespace ICSharpCode.PackageManagement
 
 		public InstalledPackagesViewModel(
 			IPackageManagementService packageManagementService,
+			IMessageReporter messageReporter,
 			ITaskFactory taskFactory)
-			: base(packageManagementService, taskFactory)
+			: base(packageManagementService, messageReporter, taskFactory)
 		{
 			packageManagementService.PackageInstalled += PackageInstalled;
 			packageManagementService.PackageUninstalled += PackageUninstalled;
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackageUpdatesViewModel.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackageUpdatesViewModel.cs
index 43daa6323a..04c3f02af4 100644
--- a/src/AddIns/Misc/PackageManagement/Project/Src/PackageUpdatesViewModel.cs
+++ b/src/AddIns/Misc/PackageManagement/Project/Src/PackageUpdatesViewModel.cs
@@ -18,8 +18,9 @@ namespace ICSharpCode.PackageManagement
 		
 		public PackageUpdatesViewModel(
 			IPackageManagementService packageManagementService,
+			IMessageReporter messageReporter,
 			ITaskFactory taskFactory)
-			: base(packageManagementService, taskFactory)
+			: base(packageManagementService, messageReporter, taskFactory)
 		{
 			this.packageManagementService = packageManagementService;
 		}
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModel.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModel.cs
index a46a3a89dd..5eb78c2d28 100644
--- a/src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModel.cs
+++ b/src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModel.cs
@@ -16,6 +16,7 @@ namespace ICSharpCode.PackageManagement
 		
 		IPackageManagementService packageManagementService;
 		ILicenseAcceptanceService licenseAcceptanceService;
+		IMessageReporter messageReporter;
 		IPackage package;
 		IEnumerable<PackageOperation> packageOperations = new PackageOperation[0];
 		IPackageRepository sourcePackageRepository;
@@ -25,12 +26,14 @@ namespace ICSharpCode.PackageManagement
 		public PackageViewModel(
 			IPackage package,
 			IPackageManagementService packageManagementService,
-			ILicenseAcceptanceService licenseAcceptanceService)
+			ILicenseAcceptanceService licenseAcceptanceService,
+			IMessageReporter messageReporter)
 		{
 			this.package = package;
 			this.sourcePackageRepository = packageManagementService.ActivePackageRepository;
 			this.packageManagementService = packageManagementService;
 			this.licenseAcceptanceService = licenseAcceptanceService;
+			this.messageReporter = messageReporter;
 			
 			CreateCommands();
 		}
@@ -166,14 +169,17 @@ namespace ICSharpCode.PackageManagement
 		
 		public void AddPackage()
 		{
+			ClearReportedMessages();
 			LogAddingPackage();
-			GetPackageOperations();
-			if (CanInstallPackage()) {
-				InstallPackage();
-			}
+			TryInstallingPackage();
 			LogAfterPackageOperationCompletes();
 		}
 		
+		void ClearReportedMessages()
+		{
+			messageReporter.ClearMessage();
+		}
+		
 		void LogAddingPackage()
 		{
 			string message = GetFormattedStartPackageOperationMessage(AddingPackageMessageFormat);
@@ -276,16 +282,35 @@ namespace ICSharpCode.PackageManagement
 			return package.RequireLicenseAcceptance && !IsPackageInstalled(package);
 		}
 		
+		void TryInstallingPackage()
+		{
+			try {
+				GetPackageOperations();
+				if (CanInstallPackage()) {
+					InstallPackage();
+				}
+			} catch (Exception ex) {
+				ReportError(ex);
+				Log(ex.ToString());
+			}
+		}
+		
 		void InstallPackage()
 		{
 			packageManagementService.InstallPackage(sourcePackageRepository, package, packageOperations);
 			OnPropertyChanged(model => model.IsAdded);
 		}
 		
+		void ReportError(Exception ex)
+		{
+			messageReporter.ShowErrorMessage(ex.Message);
+		}
+		
 		public void RemovePackage()
 		{
+			ClearReportedMessages();
 			LogRemovingPackage();
-			packageManagementService.UninstallPackage(sourcePackageRepository, package);
+			TryUninstallingPackage();
 			LogAfterPackageOperationCompletes();
 			
 			OnPropertyChanged(model => model.IsAdded);
@@ -300,5 +325,15 @@ namespace ICSharpCode.PackageManagement
 		protected virtual string RemovingPackageMessageFormat {
 			get { return "Uninstalling...{0}"; }
 		}
+		
+		void TryUninstallingPackage()
+		{
+			try {
+				packageManagementService.UninstallPackage(sourcePackageRepository, package);
+			} catch (Exception ex) {
+				ReportError(ex);
+				Log(ex.ToString());
+			}
+		}
 	}
 }
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModelFactory.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModelFactory.cs
index 7212cfa1f0..09eede7aec 100644
--- a/src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModelFactory.cs
+++ b/src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModelFactory.cs
@@ -10,18 +10,16 @@ namespace ICSharpCode.PackageManagement
 	{
 		IPackageManagementService packageManagementService;
 		ILicenseAcceptanceService licenseAcceptanceService;
-		
-		public PackageViewModelFactory(IPackageManagementService packageManagementService)
-			: this(packageManagementService, null)
-		{
-		}
+		IMessageReporter messageReporter;
 		
 		public PackageViewModelFactory(
 			IPackageManagementService packageManagementService,
-			ILicenseAcceptanceService licenseAcceptanceService)
+			ILicenseAcceptanceService licenseAcceptanceService,
+			IMessageReporter messageReport)
 		{
 			this.packageManagementService = packageManagementService;
 			this.licenseAcceptanceService = licenseAcceptanceService;
+			this.messageReporter = messageReport;
 		}
 		
 		public PackageViewModel CreatePackageViewModel(IPackage package)
@@ -29,7 +27,8 @@ namespace ICSharpCode.PackageManagement
 			return new PackageViewModel(
 				package, 
 				packageManagementService, 
-				licenseAcceptanceService);
+				licenseAcceptanceService,
+				messageReporter);
 		}
 	}
 }
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackagesViewModel.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackagesViewModel.cs
index c47dca7304..0489523f8f 100644
--- a/src/AddIns/Misc/PackageManagement/Project/Src/PackagesViewModel.cs
+++ b/src/AddIns/Misc/PackageManagement/Project/Src/PackagesViewModel.cs
@@ -33,10 +33,14 @@ namespace ICSharpCode.PackageManagement
 		bool hasError;
 		string errorMessage = String.Empty;
 		
-		public PackagesViewModel(IPackageManagementService packageManagementService, ITaskFactory taskFactory)
+		public PackagesViewModel(
+			IPackageManagementService packageManagementService,
+			IMessageReporter messageReporter,
+			ITaskFactory taskFactory)
 			: this(
 				packageManagementService,
 				new LicenseAcceptanceService(),
+				messageReporter,
 				taskFactory)
 		{
 		}
@@ -44,10 +48,11 @@ namespace ICSharpCode.PackageManagement
 		public PackagesViewModel(
 			IPackageManagementService packageManagementService,
 			ILicenseAcceptanceService licenseAcceptanceService,
+			IMessageReporter messageReporter,
 			ITaskFactory taskFactory)
 			: this(
 				packageManagementService, 
-				new PackageViewModelFactory(packageManagementService, licenseAcceptanceService),
+				new PackageViewModelFactory(packageManagementService, licenseAcceptanceService, messageReporter),
 				taskFactory)
 		{
 		}
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/RecentPackagesViewModel.cs b/src/AddIns/Misc/PackageManagement/Project/Src/RecentPackagesViewModel.cs
index fb54cff524..ee67c70b43 100644
--- a/src/AddIns/Misc/PackageManagement/Project/Src/RecentPackagesViewModel.cs
+++ b/src/AddIns/Misc/PackageManagement/Project/Src/RecentPackagesViewModel.cs
@@ -11,8 +11,11 @@ namespace ICSharpCode.PackageManagement
 	{
 		IPackageRepository recentPackageRepository;
 		
-		public RecentPackagesViewModel(IPackageManagementService packageManagementService, ITaskFactory taskFactory)
-			: base(packageManagementService, taskFactory)
+		public RecentPackagesViewModel(
+			IPackageManagementService packageManagementService,
+			IMessageReporter messageReporter,
+			ITaskFactory taskFactory)
+			: base(packageManagementService, messageReporter, taskFactory)
 		{
 			recentPackageRepository = packageManagementService.RecentPackageRepository;
 			packageManagementService.PackageInstalled += PackageInstalled;
diff --git a/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj b/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj
index b35c148687..debd8ebeda 100644
--- a/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj
+++ b/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj
@@ -68,10 +68,13 @@
     <Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Src\Helpers\ExceptionThrowingPackageManagementService.cs" />
+    <Compile Include="Src\Helpers\ExceptionThrowingPackageOperationResolver.cs" />
     <Compile Include="Src\Helpers\FakeCompilerMessageView.cs" />
     <Compile Include="Src\Helpers\FakeFileService.cs" />
     <Compile Include="Src\Helpers\FakeLicenseAcceptanceService.cs" />
     <Compile Include="Src\Helpers\FakeMessageCategoryView.cs" />
+    <Compile Include="Src\Helpers\FakeMessageReporter.cs" />
     <Compile Include="Src\Helpers\FakePackageManager.cs" />
     <Compile Include="Src\Helpers\FakePackageManagerFactory.cs" />
     <Compile Include="Src\Helpers\FakePackageOperationResolver.cs" />
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/AddPackageReferenceViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/AddPackageReferenceViewModelTests.cs
index 198239b6d0..d1861869c9 100644
--- a/src/AddIns/Misc/PackageManagement/Test/Src/AddPackageReferenceViewModelTests.cs
+++ b/src/AddIns/Misc/PackageManagement/Test/Src/AddPackageReferenceViewModelTests.cs
@@ -37,6 +37,27 @@ namespace PackageManagement.Tests
 			taskFactory.ExecuteAllFakeTasks();
 		}
 		
+		List<string> CallShowErrorMessageAndRecordPropertiesChanged(string message)
+		{
+			var propertyNamesChanged = RecordViewModelPropertiesChanged();
+			viewModel.ShowErrorMessage(message);
+			return propertyNamesChanged;
+		}
+		
+		List<string> RecordViewModelPropertiesChanged()
+		{
+			var propertyNamesChanged = new List<string>();
+			viewModel.PropertyChanged += (sender, e) => propertyNamesChanged.Add(e.PropertyName);
+			return propertyNamesChanged;
+		}
+
+		List<string> CallClearMessageAndRecordPropertiesChanged()
+		{
+			var propertyNamesChanged = RecordViewModelPropertiesChanged();
+			viewModel.ClearMessage();
+			return propertyNamesChanged;
+		}		
+		
 		[Test]
 		public void InstalledPackagesViewModel_ProjectHasOneInstalledPackage_HasOnePackageViewModel()
 		{
@@ -112,5 +133,87 @@ namespace PackageManagement.Tests
 			
 			PackageCollectionAssert.AreEqual(expectedPackages, viewModel.RecentPackagesViewModel.PackageViewModels);
 		}
+		
+		[Test]
+		public void ShowErrorMessage_ErrorMessageToBeDisplayedToUser_MessageIsSet()
+		{
+			CreateViewModel();
+			viewModel.ShowErrorMessage("Test");
+			
+			Assert.AreEqual("Test", viewModel.Message);
+		}
+		
+		[Test]
+		public void ShowErrorMessage_ErrorMessageToBeDisplayedToUser_MessagePropertyIsChanged()
+		{
+			CreateViewModel();
+			List<string> propertyNamesChanged = CallShowErrorMessageAndRecordPropertiesChanged("Test");
+			
+			bool result = propertyNamesChanged.Contains("Message");
+			
+			Assert.IsTrue(result);
+		}
+		
+		[Test]
+		public void ShowErrorMessage_ErrorMessageToBeDisplayedToUser_HasErrorIsTrue()
+		{
+			CreateViewModel();
+			viewModel.ShowErrorMessage("Test");
+			
+			Assert.IsTrue(viewModel.HasError);
+		}
+		
+		[Test]
+		public void ShowErrorMessage_ErrorMessageToBeDisplayedToUser_HasErrorPropertyIsChanged()
+		{
+			CreateViewModel();
+			List<string> propertyNamesChanged = CallShowErrorMessageAndRecordPropertiesChanged("Test");
+			
+			bool result = propertyNamesChanged.Contains("HasError");
+			
+			Assert.IsTrue(result);
+		}
+		
+		[Test]
+		public void ClearMessage_ErrorMessageCurrentlyDisplayed_MessageIsCleared()
+		{
+			CreateViewModel();
+			viewModel.Message = "test";
+			viewModel.ClearMessage();
+			
+			Assert.IsNull(viewModel.Message);
+		}
+		
+		[Test]
+		public void ClearMessage_ErrorMessageCurrentlyDisplayed_MessagePropertyIsChanged()
+		{
+			CreateViewModel();
+			List<string> propertyNamesChanged = CallClearMessageAndRecordPropertiesChanged();
+			
+			bool result = propertyNamesChanged.Contains("Message");
+			
+			Assert.IsTrue(result);
+		}
+		
+		[Test]
+		public void ClearMessages_ErrorMessageCurrentlyDisplayed_HasErrorPropertyIsChanged()
+		{
+			CreateViewModel();
+			List<string> propertyNamesChanged = CallClearMessageAndRecordPropertiesChanged();
+			
+			bool result = propertyNamesChanged.Contains("HasError");
+			
+			Assert.IsTrue(result);
+		}
+		
+		[Test]
+		public void ClearMessage_ErrorMessageCurrentlyDisplayed_HasErrorIsFalse()
+		{
+			CreateViewModel();
+			viewModel.HasError = true;
+			viewModel.ClearMessage();
+			
+			Assert.IsFalse(viewModel.HasError);
+		}
 	}
 }
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/AvailablePackagesViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/AvailablePackagesViewModelTests.cs
index 4501e0405c..78106bf926 100644
--- a/src/AddIns/Misc/PackageManagement/Test/Src/AvailablePackagesViewModelTests.cs
+++ b/src/AddIns/Misc/PackageManagement/Test/Src/AvailablePackagesViewModelTests.cs
@@ -32,7 +32,8 @@ namespace PackageManagement.Tests
 		void CreateViewModel(IPackageManagementService packageManagementService)
 		{
 			taskFactory = new FakeTaskFactory();
-			viewModel = new AvailablePackagesViewModel(packageManagementService, taskFactory);
+			var messageReporter = new FakeMessageReporter();
+			viewModel = new AvailablePackagesViewModel(packageManagementService, messageReporter, taskFactory);
 		}
 		
 		void CompleteReadPackagesTask()
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/ExceptionThrowingPackageManagementService.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/ExceptionThrowingPackageManagementService.cs
new file mode 100644
index 0000000000..777f233ab2
--- /dev/null
+++ b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/ExceptionThrowingPackageManagementService.cs
@@ -0,0 +1,36 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.PackageManagement.Design;
+using NuGet;
+
+namespace PackageManagement.Tests.Helpers
+{
+	public class ExceptionThrowingPackageManagementService : FakePackageManagementService
+	{
+		public Exception ExeptionToThrowWhenActiveProjectManagerAccessed { get; set; }
+		public Exception ExeptionToThrowWhenInstallPackageCalled { get; set; }
+		public Exception ExeptionToThrowWhenUninstallPackageCalled { get; set; }
+
+		public override IProjectManager ActiveProjectManager {
+			get {
+				if (ExeptionToThrowWhenActiveProjectManagerAccessed != null) {
+					throw ExeptionToThrowWhenActiveProjectManagerAccessed;
+				}
+				return base.ActiveProjectManager;
+			}
+		}
+		
+		public override void InstallPackage(IPackageRepository repository, IPackage package, IEnumerable<PackageOperation> operations)
+		{
+			throw ExeptionToThrowWhenInstallPackageCalled;
+		}
+		
+		public override void UninstallPackage(IPackageRepository repository, IPackage package)
+		{
+			throw ExeptionToThrowWhenUninstallPackageCalled;
+		}
+	}
+}
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/ExceptionThrowingPackageOperationResolver.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/ExceptionThrowingPackageOperationResolver.cs
new file mode 100644
index 0000000000..29ca5d3bb0
--- /dev/null
+++ b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/ExceptionThrowingPackageOperationResolver.cs
@@ -0,0 +1,19 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.Collections.Generic;
+using NuGet;
+
+namespace PackageManagement.Tests.Helpers
+{
+	public class ExceptionThrowingPackageOperationResolver : FakePackageOperationResolver
+	{
+		public Exception ResolveOperationsExceptionToThrow;
+		
+		public override IEnumerable<PackageOperation> ResolveOperations(IPackage package)
+		{
+			throw ResolveOperationsExceptionToThrow;
+		}
+	}
+}
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakeMessageReporter.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakeMessageReporter.cs
new file mode 100644
index 0000000000..196439a512
--- /dev/null
+++ b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakeMessageReporter.cs
@@ -0,0 +1,24 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using ICSharpCode.PackageManagement;
+
+namespace PackageManagement.Tests.Helpers
+{
+	public class FakeMessageReporter : IMessageReporter
+	{
+		public string MessagePassedToShowErrorMessage;
+		public bool IsClearMessageCalled;
+		
+		public void ShowErrorMessage(string message)
+		{
+			MessagePassedToShowErrorMessage = message;
+		}
+		
+		public void ClearMessage()
+		{
+			IsClearMessageCalled = true;
+		}
+	}
+}
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageOperationResolver.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageOperationResolver.cs
index f2395f2137..114b68df21 100644
--- a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageOperationResolver.cs
+++ b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageOperationResolver.cs
@@ -11,7 +11,7 @@ namespace PackageManagement.Tests.Helpers
 	{
 		public List<PackageOperation> PackageOperations = new List<PackageOperation>();
 		
-		public IEnumerable<PackageOperation> ResolveOperations(IPackage package)
+		public virtual IEnumerable<PackageOperation> ResolveOperations(IPackage package)
 		{
 			return PackageOperations;
 		}
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackageViewModel.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackageViewModel.cs
index 4f76ce0fa9..372725ebdf 100644
--- a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackageViewModel.cs
+++ b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackageViewModel.cs
@@ -14,31 +14,36 @@ namespace PackageManagement.Tests.Helpers
 		public FakePackageRepository FakeSourcePackageRepository;
 		public FakePackageManagementService	FakePackageManagementService;
 		public FakeLicenseAcceptanceService	FakeLicenseAcceptanceService;
+		public FakeMessageReporter FakeMessageReporter;
 		public FakePackage FakePackage;
 		public ILogger LoggerUsedWhenCreatingPackageResolver;
 		public string PackageViewModelAddingPackageMessageFormat = String.Empty;
 		public string PackageViewModelRemovingPackageMessageFormat = String.Empty;
 		
-		public TestablePackageViewModel()
+		public TestablePackageViewModel(FakePackageManagementService packageManagementService)
 			: this(
 				new FakePackage(),
-				new FakePackageManagementService(),
-				new FakeLicenseAcceptanceService())
-		{
+				packageManagementService,
+				new FakeLicenseAcceptanceService(),
+				new FakeMessageReporter())
+		{		
 		}
 		
 		public TestablePackageViewModel(
 			FakePackage package,
 			FakePackageManagementService packageManagementService,
-			FakeLicenseAcceptanceService licenseAcceptanceService)
+			FakeLicenseAcceptanceService licenseAcceptanceService,
+			FakeMessageReporter messageReporter)
 			: base(
 				package,
 				packageManagementService,
-				licenseAcceptanceService)
+				licenseAcceptanceService,
+				messageReporter)
 		{
 			this.FakePackage = package;
 			this.FakePackageManagementService = packageManagementService;
 			this.FakeLicenseAcceptanceService = licenseAcceptanceService;
+			this.FakeMessageReporter = messageReporter;
 			this.FakeSourcePackageRepository = FakePackageManagementService.FakeActivePackageRepository;
 		}
 		
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackagesViewModel.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackagesViewModel.cs
index b22c022235..0c57988ce0 100644
--- a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackagesViewModel.cs
+++ b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackagesViewModel.cs
@@ -31,7 +31,7 @@ namespace PackageManagement.Tests.Helpers
 		}
 		
 		public TestablePackagesViewModel(FakePackageManagementService packageManagementService, FakeTaskFactory taskFactory)
-			: base(packageManagementService, taskFactory)
+			: base(packageManagementService, new FakeMessageReporter(), taskFactory)
 		{
 			FakePackageManagementService = packageManagementService;
 			FakeTaskFactory = taskFactory;
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/InstalledPackagesViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/InstalledPackagesViewModelTests.cs
index 400eb55dbf..e2de1db583 100644
--- a/src/AddIns/Misc/PackageManagement/Test/Src/InstalledPackagesViewModelTests.cs
+++ b/src/AddIns/Misc/PackageManagement/Test/Src/InstalledPackagesViewModelTests.cs
@@ -15,6 +15,7 @@ namespace PackageManagement.Tests
 	{
 		InstalledPackagesViewModel viewModel;
 		FakePackageManagementService packageManagementService;
+		ExceptionThrowingPackageManagementService exceptionThrowingPackageManagementService;
 		FakeTaskFactory taskFactory;
 		
 		void CreateViewModel()
@@ -28,10 +29,16 @@ namespace PackageManagement.Tests
 			packageManagementService = new FakePackageManagementService();
 		}
 		
+		void CreateExceptionThrowingPackageManagementService()
+		{
+			exceptionThrowingPackageManagementService = new ExceptionThrowingPackageManagementService();
+		}
+		
 		void CreateViewModel(FakePackageManagementService packageManagementService)
 		{
 			taskFactory = new FakeTaskFactory();
-			viewModel = new InstalledPackagesViewModel(packageManagementService, taskFactory);			
+			var messageReporter = new FakeMessageReporter();
+			viewModel = new InstalledPackagesViewModel(packageManagementService, messageReporter, taskFactory);			
 		}
 		
 		void CompleteReadPackagesTask()
@@ -86,9 +93,9 @@ namespace PackageManagement.Tests
 		[Test]
 		public void HasError_ActiveProjectManagerThrowsException_ReturnsTrue()
 		{
-			CreatePackageManagementService();
-			packageManagementService.ActiveProjectManagerExeptionToThrow = new Exception();
-			CreateViewModel(packageManagementService);
+			CreateExceptionThrowingPackageManagementService();
+			exceptionThrowingPackageManagementService.ExeptionToThrowWhenActiveProjectManagerAccessed = new Exception();
+			CreateViewModel(exceptionThrowingPackageManagementService);
 			
 			Assert.IsTrue(viewModel.HasError);
 		}
@@ -96,9 +103,9 @@ namespace PackageManagement.Tests
 		[Test]
 		public void ErrorMessage_ActiveProjectManagerThrowsException_ReturnsErrorMessageFromException()
 		{
-			CreatePackageManagementService();
-			packageManagementService.ActiveProjectManagerExeptionToThrow = new Exception("Test");
-			CreateViewModel(packageManagementService);
+			CreateExceptionThrowingPackageManagementService();
+			exceptionThrowingPackageManagementService.ExeptionToThrowWhenActiveProjectManagerAccessed = new Exception("Test");
+			CreateViewModel(exceptionThrowingPackageManagementService);
 			
 			Assert.AreEqual("Test", viewModel.ErrorMessage);
 		}
@@ -106,9 +113,9 @@ namespace PackageManagement.Tests
 		[Test]
 		public void ReadPackages_ActiveProjectManagerThrowsException_ErrorMessageFromExceptionNotOverriddenByReadPackagesCall()
 		{
-			CreatePackageManagementService();
-			packageManagementService.ActiveProjectManagerExeptionToThrow = new Exception("Test");
-			CreateViewModel(packageManagementService);
+			CreateExceptionThrowingPackageManagementService();
+			exceptionThrowingPackageManagementService.ExeptionToThrowWhenActiveProjectManagerAccessed = new Exception("Test");
+			CreateViewModel(exceptionThrowingPackageManagementService);
 			viewModel.ReadPackages();
 			
 			ApplicationException ex = Assert.Throws<ApplicationException>(() => CompleteReadPackagesTask());
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/PackageUpdatesViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/PackageUpdatesViewModelTests.cs
index 50938e3b30..4f5c0110a4 100644
--- a/src/AddIns/Misc/PackageManagement/Test/Src/PackageUpdatesViewModelTests.cs
+++ b/src/AddIns/Misc/PackageManagement/Test/Src/PackageUpdatesViewModelTests.cs
@@ -20,7 +20,8 @@ namespace PackageManagement.Tests
 		{
 			packageManagementService = new FakePackageManagementService();
 			taskFactory = new FakeTaskFactory();
-			viewModel = new PackageUpdatesViewModel(packageManagementService, taskFactory);
+			var messageReporter = new FakeMessageReporter();
+			viewModel = new PackageUpdatesViewModel(packageManagementService, messageReporter, taskFactory);
 		}
 		
 		void CompleteReadPackagesTask()
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/PackageViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/PackageViewModelTests.cs
index db7e595246..af8a0ee596 100644
--- a/src/AddIns/Misc/PackageManagement/Test/Src/PackageViewModelTests.cs
+++ b/src/AddIns/Misc/PackageManagement/Test/Src/PackageViewModelTests.cs
@@ -18,14 +18,29 @@ namespace PackageManagement.Tests
 		FakePackageManagementService packageManagementService;
 		FakePackageRepository sourcePackageRepository;
 		FakeLicenseAcceptanceService licenseAcceptanceService;
+		FakeMessageReporter messageReporter;
+		ExceptionThrowingPackageManagementService exceptionThrowingPackageManagementService;
 		
 		void CreateViewModel()
 		{
-			viewModel = new TestablePackageViewModel();
+			packageManagementService = new FakePackageManagementService();
+			CreateViewModel(packageManagementService);
+		}
+		
+		void CreateViewModelWithExceptionThrowingPackageManagementService()
+		{
+			exceptionThrowingPackageManagementService = new ExceptionThrowingPackageManagementService();
+			CreateViewModel(exceptionThrowingPackageManagementService);
+		}
+		
+		void CreateViewModel(FakePackageManagementService packageManagementService)
+		{
+			viewModel = new TestablePackageViewModel(packageManagementService);
 			package = viewModel.FakePackage;
-			packageManagementService = viewModel.FakePackageManagementService;
+			this.packageManagementService = packageManagementService;
 			sourcePackageRepository = packageManagementService.FakeActivePackageRepository;
 			licenseAcceptanceService = viewModel.FakeLicenseAcceptanceService;
+			messageReporter = viewModel.FakeMessageReporter;
 		}
 		
 		FakePackage AddPackageDependencyThatDoesNotRequireLicenseAcceptance(string packageId)
@@ -466,7 +481,7 @@ namespace PackageManagement.Tests
 		}
 		
 		[Test]
-		public void AddPackage_PackageAddedSuccessfully_NextToLastMesssageLoggedMarksEndOfInstallation()
+		public void AddPackage_PackageAddedSuccessfully_NextToLastMessageLoggedMarksEndOfInstallation()
 		{
 			CreateViewModel();
 			viewModel.AddPackage();
@@ -478,7 +493,7 @@ namespace PackageManagement.Tests
 		}
 		
 		[Test]
-		public void AddPackage_PackageAddedSuccessfully_LastMesssageLoggedIsEmptyLine()
+		public void AddPackage_PackageAddedSuccessfully_LastMessageLoggedIsEmptyLine()
 		{
 			CreateViewModel();
 			viewModel.AddPackage();
@@ -505,7 +520,7 @@ namespace PackageManagement.Tests
 		}
 		
 		[Test]
-		public void RemovePackage_PackageRemovedSuccessfully_NextToLastMesssageLoggedMarksEndOfInstallation()
+		public void RemovePackage_PackageRemovedSuccessfully_NextToLastMessageLoggedMarksEndOfInstallation()
 		{
 			CreateViewModel();
 			viewModel.RemovePackage();
@@ -517,7 +532,7 @@ namespace PackageManagement.Tests
 		}
 		
 		[Test]
-		public void RemovePackage_PackageRemovedSuccessfully_LastMesssageLoggedIsEmptyLine()
+		public void RemovePackage_PackageRemovedSuccessfully_LastMessageLoggedIsEmptyLine()
 		{
 			CreateViewModel();
 			viewModel.RemovePackage();
@@ -527,5 +542,85 @@ namespace PackageManagement.Tests
 						
 			Assert.AreEqual(expectedMessage, actualMessage);
 		}
+		
+		[Test]
+		public void AddPackage_ExceptionWhenInstallingPackage_ExceptionErrorMessageReported()
+		{
+			CreateViewModelWithExceptionThrowingPackageManagementService();
+			Exception ex = new Exception("Test");
+			exceptionThrowingPackageManagementService.ExeptionToThrowWhenInstallPackageCalled = ex;
+			viewModel.AddPackage();
+			
+			Assert.AreEqual("Test", messageReporter.MessagePassedToShowErrorMessage);
+		}
+		
+		[Test]
+		public void AddPackage_PackageAddedSuccessfully_MessagesReportedPreviouslyAreCleared()
+		{
+			CreateViewModel();
+			viewModel.AddPackage();
+			
+			Assert.IsTrue(messageReporter.IsClearMessageCalled);
+		}
+		
+		[Test]
+		public void AddPackage_ExceptionWhenInstallingPackage_ExceptionLogged()
+		{
+			CreateViewModelWithExceptionThrowingPackageManagementService();
+			Exception ex = new Exception("Exception error message");
+			exceptionThrowingPackageManagementService.ExeptionToThrowWhenInstallPackageCalled = ex;
+			viewModel.AddPackage();
+			
+			string actualMessage = packageManagementService.FakeOutputMessagesView.SecondFormattedMessageLogged;
+			bool containsExceptionErrorMessage = actualMessage.Contains("Exception error message");
+			
+			Assert.IsTrue(containsExceptionErrorMessage, actualMessage);
+		}
+		
+		[Test]
+		public void RemovePackage_ExceptionWhenUninstallingPackage_ExceptionErrorMessageReported()
+		{
+			CreateViewModelWithExceptionThrowingPackageManagementService();
+			Exception ex = new Exception("Test");
+			exceptionThrowingPackageManagementService.ExeptionToThrowWhenUninstallPackageCalled = ex;
+			viewModel.RemovePackage();
+			
+			Assert.AreEqual("Test", messageReporter.MessagePassedToShowErrorMessage);
+		}
+		
+		[Test]
+		public void RemovePackage_PackageUninstalledSuccessfully_MessagesReportedPreviouslyAreCleared()
+		{
+			CreateViewModel();
+			viewModel.RemovePackage();
+			
+			Assert.IsTrue(messageReporter.IsClearMessageCalled);
+		}
+		
+		[Test]
+		public void RemovePackage_ExceptionWhenUninstallingPackage_ExceptionLogged()
+		{
+			CreateViewModelWithExceptionThrowingPackageManagementService();
+			Exception ex = new Exception("Exception error message");
+			exceptionThrowingPackageManagementService.ExeptionToThrowWhenUninstallPackageCalled = ex;
+			viewModel.RemovePackage();
+			
+			string actualMessage = packageManagementService.FakeOutputMessagesView.SecondFormattedMessageLogged;
+			bool containsExceptionErrorMessage = actualMessage.Contains("Exception error message");
+			
+			Assert.IsTrue(containsExceptionErrorMessage, actualMessage);
+		}
+		
+		[Test]
+		public void AddPackage_ExceptionThrownWhenResolvingPackageOperations_ExceptionReported()
+		{
+			CreateViewModel();
+			var resolver = new ExceptionThrowingPackageOperationResolver();
+			viewModel.FakePackageOperationResolver = resolver;
+			resolver.ResolveOperationsExceptionToThrow = new Exception("Test");
+			viewModel.AddPackage();
+			
+			Assert.AreEqual("Test", messageReporter.MessagePassedToShowErrorMessage);
+		}
 	}
 }
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/RecentPackagesViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/RecentPackagesViewModelTests.cs
index fbf2ac18f9..535e8b1548 100644
--- a/src/AddIns/Misc/PackageManagement/Test/Src/RecentPackagesViewModelTests.cs
+++ b/src/AddIns/Misc/PackageManagement/Test/Src/RecentPackagesViewModelTests.cs
@@ -30,7 +30,8 @@ namespace PackageManagement.Tests
 		void CreateViewModel(FakePackageManagementService packageManagementService)
 		{
 			taskFactory = new FakeTaskFactory();
-			viewModel = new RecentPackagesViewModel(packageManagementService, taskFactory);			
+			var messageReporter = new FakeMessageReporter();
+			viewModel = new RecentPackagesViewModel(packageManagementService, messageReporter, taskFactory);			
 		}
 		
 		void CompleteReadPackagesTask()