Added traps for null params.