Try to error check some more, but need a debug context