Handle e properly :heavy_check_mark: