Remove some extra steps that are not necessary, add in some more error messaging/handling