Error Handeling Fixes