Do the container check inside load() instead.

Do the container check inside load() instead. #1409