Defaulted string values to allow for better error handling.
Merge origin/master