Added Please wait spinner to avoid NPE