The earlier patch to test for a null image class was not forwarded to
the develop branch.