Fix NPE when redirected from catalog.xhtml