Merge pull request #2266 from ControlSystemStudio/log_properties_fix

Added null pointer check for classpath case
1 job for master in 16 minutes and 7 seconds