Missing column handling improved