[MAESTRO-3865] [MAESTRO-3869] tabs to spaces in a couple places.  fix error message to be more readable and copy/pastable