Container: add checks for null in getWidth/Height functions
Merge pull request #1911 from caryoscelus/master

Container: add checks for null in getWidth/Height functions