Catch null launcher from project (issue #969)

Signed-off-by: Neil Bartlett <njbartlett@gmail.com>
Minor icon changes

Signed-off-by: Neil Bartlett <njbartlett@gmail.com>