Fix NPE
Merge branch 'Maintenance' into Development
Small graphical improvment