Fixed catch messages