More checking & warning code.