Closes #395 by checking application.getName() for null.