diff --git a/lib/private/Remote/Api/OCS.php b/lib/private/Remote/Api/OCS.php
index 427a5adcd967388f538dd68c2e47e154f77a4a38..5ce56621a71ab322523c2dd93af99cf55b792c2d 100644
--- a/lib/private/Remote/Api/OCS.php
+++ b/lib/private/Remote/Api/OCS.php
@@ -70,7 +70,14 @@ class OCS extends ApiBase implements ICapabilitiesApi, IUserApi {
 	}
 
 	public function getUser($userId) {
-		return new User($this->request('get', 'cloud/users/' . $userId));
+		$result = $this->request('get', 'cloud/users/' . $userId);
+		$keys = ['id', 'email', 'displayname', 'phone', 'address', 'website', 'groups', 'language', 'quota'];
+		foreach ($keys as $key) {
+			if (!isset($result[$key])) {
+				throw new \Exception('Invalid user response, expected field ' . $key . ' not found');
+			}
+		}
+		return new User($result);
 	}
 
 	/**