Add hacky error handling for now...

need a more elegant fix to this