FIXED a bug when message = nil