Added errors as per #3