Switched to exception rising (in remaining functions)