diff --git a/lib/yunohost/app.py b/lib/yunohost/app.py
index 7b71c20fb..9babd78f5 100644
--- a/lib/yunohost/app.py
+++ b/lib/yunohost/app.py
@@ -311,7 +311,7 @@ def app_upgrade(auth, app=[], url=None, file=None):
             manifest = _extract_app_from_file(file)
         elif url:
             manifest = _fetch_app_from_git(url)
-        elif 'lastUpdate' not in new_app_dict or 'git' not in new_app_dict:
+        elif new_app_dict is None or 'lastUpdate' not in new_app_dict or 'git' not in new_app_dict:
             msignals.display(m18n.n('custom_app_url_required', app_id), 'warning')
             continue
         elif (new_app_dict['lastUpdate'] > current_app_dict['lastUpdate']) \
diff --git a/lib/yunohost/tools.py b/lib/yunohost/tools.py
index 67e74a1e4..95fbe8f83 100644
--- a/lib/yunohost/tools.py
+++ b/lib/yunohost/tools.py
@@ -380,7 +380,7 @@ def tools_update(ignore_apps=False, ignore_packages=False):
                 new_app_dict     = app_info(original_app_id, raw=True)
 
                 # Custom app
-                if 'lastUpdate' not in new_app_dict or 'git' not in new_app_dict:
+                if new_app_dict is None or 'lastUpdate' not in new_app_dict or 'git' not in new_app_dict:
                     continue
 
                 if (new_app_dict['lastUpdate'] > current_app_dict['lastUpdate']) \