a couple of trivial cleanups: check to see if order is empty in addition to null...