Updated route and added Please wait popup to avoid NPE