[BACKLOG-824] Adding defensive code to handle null setting.
Revert "[BISERVER-11603] Encoding/Decoding - Not able to upload a file or folder"

This reverts commit a4faa47e60ec8d0f9ae8bf73e03069f20f36c4d0.
Merge pull request #2070 from pentaho-nbaker/master

[BACKLOG-824] Adding defensive code to handle null setting.