FIX: further addition of empty value handeling code in Application.java
getting code from repo