Fix NPE on ViewerController.java:296
Merge pull request #780 from emmanuel-keller/1.5

Fix NPE on ViewerController.java:296