diff --git a/phpgwapi/inc/class.sessions_db.inc.php b/phpgwapi/inc/class.sessions_db.inc.php
index 725ec214c5..b06b7347d9 100644
--- a/phpgwapi/inc/class.sessions_db.inc.php
+++ b/phpgwapi/inc/class.sessions_db.inc.php
@@ -134,6 +134,10 @@
 
 		function appsession($location = 'default', $appname = '', $data = '##NOTHING##')
 		{
+			if (!$this->account_id || !$this->sessionid)
+			{
+				return False;	// this can happen during login or logout
+			}
 			if (! $appname)
 			{
 				$appname = $GLOBALS['phpgw_info']['flags']['currentapp'];