Fix couple of exceptions