Fixed #15

...andled gracefully.