Add $() for the error string and fix some indent issues.