Catch error instead of checking for None (#59)