- improved error handling a tad