LPS-41528
LPS-41528 Fail gracefully
Merge branch 'LPS-41528' of https://github.com/samuelkong/liferay-plugins into LPS-41528
Modify the inappropriate,please review.Thanks.