fix 2 exceptions, still doesn't work