Undo last commit, changed back to setting empty blocks as NSNull.null.