Improved error handling
Added design time data