Error handling and assembly resolving improvements