diff --git a/MAC/GCF/GCFCommon/include/GCF/Utils.h b/MAC/GCF/GCFCommon/include/GCF/Utils.h
index 102d7e0735ef60c6064e9c27936d40f7420c8019..88eb5456ea64e94ea8c931e142c449cc0cdf2b16 100644
--- a/MAC/GCF/GCFCommon/include/GCF/Utils.h
+++ b/MAC/GCF/GCFCommon/include/GCF/Utils.h
@@ -9,6 +9,9 @@ namespace LOFAR {
  namespace GCF {
   namespace Common {
 
+// Returns the full or short version of the hostname
+string myHostname(bool	giveFullName);
+
 void	convListToString(std::string& listString, 
                          const std::list<std::string>& stringList);
 void	convStringToList(std::list<std::string>& stringList, 
diff --git a/MAC/GCF/GCFCommon/src/Utils.cc b/MAC/GCF/GCFCommon/src/Utils.cc
index 9236dbd0e99f8358044792694a40827abc83621b..a2e7993777d9601eec561df6d70552133436c7e8 100644
--- a/MAC/GCF/GCFCommon/src/Utils.cc
+++ b/MAC/GCF/GCFCommon/src/Utils.cc
@@ -7,13 +7,29 @@
 
 using std::set;
 
-namespace LOFAR 
+namespace LOFAR {
+ namespace GCF {
+  namespace Common {
+
+//
+// myHostname(giveFullname)
+//
+string myHostname(bool	giveFullName)
 {
- namespace GCF 
- {
-  namespace Common 
-  {
+	char	fullhostname[300];
+	if (gethostname(fullhostname, 300) != 0) {
+		return ("localhost");
+	}
+
+	if (!giveFullName) {
+		char*	dot = strchr(fullhostname, '.');
+		if (dot) {
+			*dot='\0';
+		}
+	}
 
+	return (fullhostname);
+}
 
 void convListToString(string& listString, 
                                   const list<string>& stringList)
diff --git a/MAC/GCF/TM/src/GCF_Task.cc b/MAC/GCF/TM/src/GCF_Task.cc
index aba8a0af3c6f6693d66d9caf3d2f743acc3cf265..09e5eb27c329d155dac7e74f3a38d17aaa536829 100644
--- a/MAC/GCF/TM/src/GCF_Task.cc
+++ b/MAC/GCF/TM/src/GCF_Task.cc
@@ -89,8 +89,13 @@ void GCFTask::init(int argc, char** argv)
 	// Read in the ParameterSet of the task (<task>.conf)
 	ParameterSet*	pParamSet = ACC::APS::globalParameterSet();
 	string			configFile(aCL.locate(procName + ".conf"));
-	LOG_DEBUG_STR ("Using parameterfile: " << configFile);
-	pParamSet->adoptFile(configFile);
+	if (!configFile.empty()) {
+		LOG_DEBUG_STR ("Using parameterfile: " << configFile);
+		pParamSet->adoptFile(configFile);
+	}
+	else {
+		LOG_DEBUG_STR ("NO DEFAULT PARAMETERSET FOUND");
+	}
 
 	if (_doExit) {
 		exit(-1);
diff --git a/MAC/GCF/TM/src/ServiceBroker/GSB_Controller.cc b/MAC/GCF/TM/src/ServiceBroker/GSB_Controller.cc
index ba4c4c0324a1696ff8c441bb2ffec7b471742540..acad7de86d764dab7b884a0b97940a97d24d6e8e 100644
--- a/MAC/GCF/TM/src/ServiceBroker/GSB_Controller.cc
+++ b/MAC/GCF/TM/src/ServiceBroker/GSB_Controller.cc
@@ -183,7 +183,7 @@ GCFEvent::TResult GSBController::operational(GCFEvent& event, GCFPortInterface&
 			LOG_INFO(formatString ("Serviceinfo for %s is %d", 
 									request.servicename.c_str(), portNr));
 			response.portnumber = portNr;
-			response.hostname	= Common::myHostname();
+			response.hostname	= Common::myHostname(true);
 			response.result 	= SB_NO_ERROR;
 		}
 		else {