[fix] enhanced errorhandling