Allow nulls in pushOoc, better error messages