still tweaking error behavior