Changed parameter check to use macro