Added todo for bug and better error message