adds null checks to JSONController and removes ParentForChild