Better edge-case handling

minor update