Changed window name and added error handling