NPE fix in some cases
More progress on CB frames