edge-case catch
Merge branch 'master' of https://github.com/runuo/runuo