OCW-200 Adding additional null checks.
OCW-200 Adding additional null checks.

OpenCanada/website,albertoconnor/website,OpenCanada/website,albertoconnor/website,albertoconnor/website,OpenCanada/website,OpenCanada/website,albertoconnor/website