Created by: egrimley
Pending a proper fix and handling all these cases, at least detect the cases that we cannot handle.