more error handling has been added. psa