Fix NPE when properties file is not present, minor cleanup
Fix NPE when properties file is not present, minor cleanup

panossot/xnio,xnio/xnio,fl4via/xnio,kabir/xnio,xnio/xnio,dmlloyd/xnio,stuartwdouglas/xnio,kabir/xnio,fl4via/xnio,panossot/xnio