Fixed NPE with ShortCake