Better error handling yo