Slightly better error reporting for validation problems.
Removed warlock.