Adding handling of popup message