diff --git a/Source/NSPasteboard.m b/Source/NSPasteboard.m
index 3c553c3fc..cbf1ffda4 100644
--- a/Source/NSPasteboard.m
+++ b/Source/NSPasteboard.m
@@ -29,7 +29,7 @@
 
 #include <gnustep/gui/config.h>
 #include <AppKit/NSPasteboard.h>
-#include <AppKit/PasteboardServer.h>
+#include "../Tools/PasteboardServer.h"
 #include <Foundation/NSArray.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSDictionary.h>
@@ -103,6 +103,10 @@ static	id<PasteboardServer>	the_server = nil;
               name: NSConnectionDidDieNotification
               object: conn];
     }
+    else {
+      NSLog(@"Unable to contact pasteboard server - "
+	@"please ensure that gpbs is running.\n");
+    }
   }
   return the_server;
 }