dont fail if data.p is empty
Merge branch 'bp-14388' into 2014.7
Merge pull request #14399 from thatch45/2014.7

backport #14388
Merge branch '2014.7' into develop