Improved Errorhandling and Parser