handling for object not found
v3.5.4-4
Merge branch 'release3.5.4-4'