One more error case to go, almost there
one more error case to go