Removed the notnull assertions - they fucked the compiler (even thought it was 1.7... it still liked diamonds. wierd)
Finality issue