Slightly better exception message, TODO on exception handling