Added better handling.