Fix for crashes due to no class def found