Tried making handling better...

It's getting there...