Fix up order of arguments in error message
Use ctx rather than hard coding -spersistent
Lint: Add whitespace for readability