Quick fix to error-checking during save.