Added special handlers for some errors and new tests