Handle exception if nil HPA is returned. This patch is related to the MR !18 (merged)
This will create a new commit in order to revert the existing changes.
