diff --git a/common-powervc/powervc/common/utils.py b/common-powervc/powervc/common/utils.py
index dffd035..5d0781b 100644
--- a/common-powervc/powervc/common/utils.py
+++ b/common-powervc/powervc/common/utils.py
@@ -779,10 +779,10 @@ class Utils(object):
             constants.DEFAULT_STAGING_PROJECT_NAME
         try:
             projects = []
-            if hasattr(ks_client, 'tenants'):
+            if hasattr(ks_client, 'v2') or hasattr(ks_client, 'v2.0'):
                 # For keystone V2
                 projects = ks_client.tenants.list()
-            elif hasattr(ks_client, 'projects'):
+            elif hasattr(ks_client, 'v3') or hasattr(ks_client, 'v3.0'):
                 # For keystone V3
                 projects = ks_client.projects.list()
             for tenant in projects:
diff --git a/nova-powervc/powervc/nova/driver/compute/manager.py b/nova-powervc/powervc/nova/driver/compute/manager.py
index 841d775..d5393b0 100644
--- a/nova-powervc/powervc/nova/driver/compute/manager.py
+++ b/nova-powervc/powervc/nova/driver/compute/manager.py
@@ -881,7 +881,7 @@ class PowerVCCloudManager(manager.Manager):
             # Check whether the instance has been resized
             pvc_flavor_dict = pvc_flavor.__dict__
 
-            if (db_instance_flavor['memory_mb'] ==
+            if (db_instance_flavor and db_instance_flavor['memory_mb'] ==
                 pvc_flavor_dict['ram'] and
                 db_instance_flavor['vcpus'] ==
                 pvc_flavor_dict['vcpus'] and