Add Controller Error handling