Cleaned up error reporting, validate parameters now.