better defensive programming
Merge branch '2.4-preparation' of https://github.com/Enough-Software/j2mepolish into 2.4-preparation