prevent npe
Merge branch 'develop' of https://github.com/forkch/adhoc-railway into develop