fix null object#9

smithtrenton wants to merge 3 commits intomatthewrobertson:mastermatthewrobertson/Collapse-Diff:masterfrom

smithtrenton:mastersmithtrenton/Collapse-Diff:masterCopy head branch name to clipboard