Finish up basic error handling for layouts, partials and CLI