Re-add checkEmpty