Better error handling related to 1024149