Fix - log it when there is actual message because it could be null