Add check so that custom parameters are only appended if they exist [RD-108]

All tests pass.