Temp exception handling until bug is figured out