Fixed another exception and added a todo