Add conditional wrap around  &&  to avoid error.
updated changelog