better error handling, fix '#each' bug