Merge pull request #828 from martynas-wm/v1.5.6

Fixed issue #817. Added more checks in PP Express module to avoid error notices