Added error catching for no account