Slighty better syntax error handling