Closes #395 by checking application.getName() for null.
Merge commit 'a9d40b077a0266dbcb5fc416ce933f354f74cabb' into HEAD