Change exception thrown and rename "messsage" => "message"