Added board names, improved error handling