Be more specific in rescue statement
Write many tests + minor refactoring of Node module