Fixed crash
Merge pull request #5625 from nutty898/develop_nutty_modify_framework_for315CrashFixed

Fixed crash