Fix custom default message handling.