#90 Fixed NPE on gallery view