Improved error handling on missing employee