diff --git a/api/src/Link.php b/api/src/Link.php
index 386d01ca99..fe65f6e722 100644
--- a/api/src/Link.php
+++ b/api/src/Link.php
@@ -471,7 +471,7 @@ class Link extends Link\Storage
 	 */
 	static function temp_link_id($app,$id)
 	{
-		return $app.':'.(!in_array($app, array(self::VFS_APPNAME,self::VFS_LINK, self::DATA_APPNAME)) ? $id : $id['name']);
+		return $app.':'.(!in_array($app, array(self::VFS_APPNAME,self::VFS_LINK, self::DATA_APPNAME)) || !is_array($id) ? $id : $id['name']);
 	}
 
 	/**
diff --git a/api/src/loader/exception.php b/api/src/loader/exception.php
index 1e7c14d37e..eb50137608 100755
--- a/api/src/loader/exception.php
+++ b/api/src/loader/exception.php
@@ -104,6 +104,7 @@ function egw_exception_handler($e)
 	if(!isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] == 'cli')
 	{
 		echo ($headline ? $headline.': ' : '').$e->getMessage()."\n";
+		echo $e->getFile().' ('.$e->getLine().")\n";
 		if ($GLOBALS['egw_info']['server']['exception_show_trace'])
 		{
 			echo $e->getTraceAsString()."\n";