Added Further Error Handling.