Added better error handling