Added Error Handling for App