Taking my own advice and not commiting my crashing code