Fix: syntax error
Fix: Restore error message, but only when required.