Better errors and allow updates