Implement Error Handling & partials