More errors and corner cases.