fixes for error handling on extend