Slightly better error handeling