Fixing errors. still will throw a NullPointerException
Dunno