Better error handling for current plan, and added importing of plans design document.