Fixing EVENT-33
 - do a null check when looking to see which blocks originally went with a page