Extra checks and error messages