diff --git a/Classes/Service/Workspaces.php b/Classes/Service/Workspaces.php
index 4c05e7e..bcec7e6 100644
--- a/Classes/Service/Workspaces.php
+++ b/Classes/Service/Workspaces.php
@@ -245,6 +245,7 @@ class Tx_Workspaces_Service_Workspaces implements t3lib_Singleton {
        protected function selectAllVersionsFromPages($table, $pageList, $wsid, $filter, $stage) {
 
                $fields = 'A.uid, A.t3ver_oid, A.t3ver_stage, ' . ($table==='pages' ? ' A.t3ver_swapmode,' : '') . 'B.pid AS wspid, B.pid AS livepid';
+               if (t3lib_BEfunc::isTableLocalizable($table)) $fields .= ', A.' . $GLOBALS['TCA'][$table]['ctrl']['languageField'];
                $from = $table . ' A,' . $table . ' B';
 
                        // Table A is the offline version and pid=-1 defines offline
@@ -473,6 +474,8 @@ class Tx_Workspaces_Service_Workspaces implements t3lib_Singleton {
 
                if (t3lib_BEfunc::isTableLocalizable($table)) {
                        $languageUid = $record[$GLOBALS['TCA'][$table]['ctrl']['languageField']];
+               } else {
+                       return TRUE;
                }
 
                return $GLOBALS['BE_USER']->checkLanguageAccess($languageUid);