MPS-19224 - checking for null in the paste handler
Rebuilt