Committing changes to fix the NullPointerException in QA screen.