Fixed laser data not existing in some cases
Merge pull request #1918 from tambry/laserDataFix

Fixed laser data not existing in some cases
Merge branch '6.0.x' into 6.1.x