[RHD] Added more asserts