Better errror handling
Updated scene