Impliment a fix to standardise error