Fixed error handling in Driver specific rewrite