Added message handling for non-error-messages