Re-order parameters to not break other callers

Needs a check for null now.