Added better error display for user