Fix exception when message limit is hit