Added logic to handle null values when wrapping logs

Added logic to handle null values when wrapping logs #464