NPE dodge for JList
Merge branch 'master' of https://github.com/trejkaz/haqua

Conflicts:
	CHANGES