Remove check for prompt errors
Make the function style consistant